jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367883 )
Change subject: Remove unnecessary mixin from standalone image caption node
......................................................................
Remove unnecessary mixin from standalone image caption node
The CE mixin is already mixed in to active node.
Change-Id: I2e5ba20ef2e2a226df751c88346d47f829ed12eb
---
M src/ce/nodes/ve.ce.BlockImageCaptionNode.js
M src/ce/nodes/ve.ce.TableCellNode.js
2 files changed, 1 insertion(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/src/ce/nodes/ve.ce.BlockImageCaptionNode.js
b/src/ce/nodes/ve.ce.BlockImageCaptionNode.js
index 062a7b4..e79f094 100644
--- a/src/ce/nodes/ve.ce.BlockImageCaptionNode.js
+++ b/src/ce/nodes/ve.ce.BlockImageCaptionNode.js
@@ -9,7 +9,6 @@
*
* @class
* @extends ve.ce.BranchNode
- * @mixins ve.ce.ContentEditableNode
* @mixins ve.ce.ActiveNode
*
* @constructor
@@ -21,7 +20,6 @@
ve.ce.BlockImageCaptionNode.super.apply( this, arguments );
// Mixin constructor
- ve.ce.ContentEditableNode.call( this );
ve.ce.ActiveNode.call( this );
};
@@ -29,7 +27,6 @@
OO.inheritClass( ve.ce.BlockImageCaptionNode, ve.ce.BranchNode );
-OO.mixinClass( ve.ce.BlockImageCaptionNode, ve.ce.ContentEditableNode );
OO.mixinClass( ve.ce.BlockImageCaptionNode, ve.ce.ActiveNode );
/* Static Properties */
diff --git a/src/ce/nodes/ve.ce.TableCellNode.js
b/src/ce/nodes/ve.ce.TableCellNode.js
index 46fbc5e..d14a776 100644
--- a/src/ce/nodes/ve.ce.TableCellNode.js
+++ b/src/ce/nodes/ve.ce.TableCellNode.js
@@ -10,6 +10,7 @@
* @class
* @extends ve.ce.BranchNode
* @mixins ve.ce.TableCellableNode
+ * @mixins ve.ce.ContentEditableNode
* @constructor
* @param {ve.dm.TableCellNode} model Model to observe
* @param {Object} [config] Configuration options
--
To view, visit https://gerrit.wikimedia.org/r/367883
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2e5ba20ef2e2a226df751c88346d47f829ed12eb
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
