Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195286
Change subject: Followup 11f507a98f62: also restore rowspan and colspan on
TableCellNodes
......................................................................
Followup 11f507a98f62: also restore rowspan and colspan on TableCellNodes
Re-assert rowspan and colspan on setup, like we do for classes in
LeafNode and BranchNode.
Bug: T91831
Change-Id: Iee71d007f09d4198f09e63c886040fe0582e4e54
---
M src/ce/nodes/ve.ce.TableCellNode.js
1 file changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/86/195286/1
diff --git a/src/ce/nodes/ve.ce.TableCellNode.js
b/src/ce/nodes/ve.ce.TableCellNode.js
index f2980ce..18dbb1f 100644
--- a/src/ce/nodes/ve.ce.TableCellNode.js
+++ b/src/ce/nodes/ve.ce.TableCellNode.js
@@ -26,6 +26,8 @@
// ve-ce-tableCellNode-data
// ve-ce-tableCellNode-header
.addClass( 've-ce-tableCellNode ve-ce-tableCellNode-' +
this.model.getAttribute( 'style' ) );
+
+ // Set attributes (keep in sync with #onSetup)
if ( rowspan > 1 ) {
this.$element.attr( 'rowspan', rowspan );
}
@@ -91,6 +93,24 @@
};
/**
+ * @inheritdoc
+ */
+ve.ce.TableCellNode.prototype.onSetup = function () {
+ // Parent method
+ ve.ce.TableCellNode.super.prototype.onSetup.call( this );
+
+ var rowspan = this.model.getRowspan(),
+ colspan = this.model.getColspan();
+ // Set attributes (duplicated from constructor in case this.$element is
replaced)
+ if ( rowspan > 1 ) {
+ this.$element.attr( 'rowspan', rowspan );
+ }
+ if ( colspan > 1 ) {
+ this.$element.attr( 'colspan', colspan );
+ }
+};
+
+/**
* Handle attribute changes to keep the live HTML element updated.
*/
ve.ce.TableCellNode.prototype.onAttributeChange = function ( key, from, to ) {
--
To view, visit https://gerrit.wikimedia.org/r/195286
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee71d007f09d4198f09e63c886040fe0582e4e54
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: wmf/1.25wmf20
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
