Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/367890 )
Change subject: Default table cells to ce=false, and always set ce state to
editing state
......................................................................
Default table cells to ce=false, and always set ce state to editing state
Bug: T171728
Change-Id: Ic4d87190e4ebf2a9725d25142d5f02cf26f8147b
---
M src/ce/nodes/ve.ce.TableCellNode.js
1 file changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/90/367890/1
diff --git a/src/ce/nodes/ve.ce.TableCellNode.js
b/src/ce/nodes/ve.ce.TableCellNode.js
index d14a776..e1ac622 100644
--- a/src/ce/nodes/ve.ce.TableCellNode.js
+++ b/src/ce/nodes/ve.ce.TableCellNode.js
@@ -23,6 +23,10 @@
ve.ce.TableCellableNode.call( this );
ve.ce.ContentEditableNode.call( this );
+ this.editing = false;
+ // CE nodes initialize to true
+ this.setContentEditable();
+
// Events
this.model.connect( this, {
update: 'onUpdate',
@@ -80,12 +84,22 @@
* @param {boolean} enable Enable editing
*/
ve.ce.TableCellNode.prototype.setEditing = function ( enable ) {
+ this.editing = enable;
this.$element.toggleClass( 've-ce-tableCellNode-editing', enable );
- this.setContentEditable( enable );
+ this.setContentEditable();
this.getRoot().getSurface().setActiveNode( enable ? this : null );
};
/**
+ * @inheritdoc ve.ce.ContentEditableNode
+ */
+ve.ce.TableCellNode.prototype.setContentEditable = function () {
+ // Overwite any state passed to setContentEditable with this.editing,
so that
+ // setContentEditable doesn't override the editing state.
+ return ve.ce.ContentEditableNode.prototype.setContentEditable.call(
this, this.editing );
+};
+
+/**
* Handle model update events.
*
* If the style changed since last update the DOM wrapper will be replaced
with an appropriate one.
--
To view, visit https://gerrit.wikimedia.org/r/367890
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4d87190e4ebf2a9725d25142d5f02cf26f8147b
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
