Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348059 )
Change subject: Tag mixin inheritance hacks with bug
......................................................................
Tag mixin inheritance hacks with bug
Also mixin dm.MWResiazble to dm.MWImage (already done
in CE).
Bug: T92540
Change-Id: I32215873993a7e9a7f775ce3f39e2d378e0f31cd
---
M modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
M modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js
M modules/ve-mw/ce/nodes/ve.ce.MWInlineImageNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
6 files changed, 12 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/59/348059/1
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
index 4a1be91..68b8885 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
@@ -75,7 +75,7 @@
OO.inheritClass( ve.ce.MWBlockImageNode, ve.ce.BranchNode );
-// Need to mixin base class as well
+// Need to mixin base class as well (T92540)
OO.mixinClass( ve.ce.MWBlockImageNode, ve.ce.GeneratedContentNode );
OO.mixinClass( ve.ce.MWBlockImageNode, ve.ce.MWImageNode );
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js
index 8dd2424..6310c4e 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js
@@ -49,7 +49,7 @@
OO.mixinClass( ve.ce.MWImageNode, ve.ce.FocusableNode );
-// Need to mixin base class as well
+// Need to mixin base class as well (T92540)
OO.mixinClass( ve.ce.MWImageNode, ve.ce.ResizableNode );
OO.mixinClass( ve.ce.MWImageNode, ve.ce.MWResizableNode );
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWInlineImageNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWInlineImageNode.js
index b27790a..c7314e6 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWInlineImageNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWInlineImageNode.js
@@ -61,7 +61,7 @@
OO.inheritClass( ve.ce.MWInlineImageNode, ve.ce.LeafNode );
-// Need to mixin base class as well
+// Need to mixin base class as well (T92540)
OO.mixinClass( ve.ce.MWInlineImageNode, ve.ce.GeneratedContentNode );
OO.mixinClass( ve.ce.MWInlineImageNode, ve.ce.MWImageNode );
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
index a93cad7..03c4118 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
@@ -30,7 +30,7 @@
OO.inheritClass( ve.dm.MWBlockImageNode, ve.dm.BranchNode );
-// Need to mixin base class as well
+// Need to mixin base class as well (T92540)
OO.mixinClass( ve.dm.MWBlockImageNode, ve.dm.GeneratedContentNode );
OO.mixinClass( ve.dm.MWBlockImageNode, ve.dm.MWImageNode );
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
index 7d1f081..22e446e 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js
@@ -12,7 +12,7 @@
* @abstract
* @extends ve.dm.GeneratedContentNode
* @mixins ve.dm.FocusableNode
- * @mixins ve.dm.ResizableNode
+ * @mixins ve.dm.MWResizableNode
*
* @constructor
*/
@@ -21,8 +21,8 @@
ve.dm.GeneratedContentNode.call( this );
// Mixin constructors
- ve.dm.ResizableNode.call( this );
ve.dm.FocusableNode.call( this );
+ ve.dm.MWResizableNode.call( this );
this.scalablePromise = null;
@@ -47,7 +47,11 @@
OO.mixinClass( ve.dm.MWImageNode, ve.dm.FocusableNode );
-OO.mixinClass( ve.dm.MWImageNode, ve.dm.ResizableNode );
+// Need to mixin base class as well (T92540)
+OO.mixinClass( ve.dm.MWImageNode, ve.ce.ResizableNode );
+
+OO.mixinClass( ve.dm.MWImageNode, ve.ce.MWResizableNode );
+
/* Static methods */
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
index fe869f9..330d6c0 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
@@ -27,7 +27,7 @@
OO.inheritClass( ve.dm.MWInlineImageNode, ve.dm.LeafNode );
-// Need to mixin base class as well
+// Need to mixin base class as well (T92540)
OO.mixinClass( ve.dm.MWInlineImageNode, ve.dm.GeneratedContentNode );
OO.mixinClass( ve.dm.MWInlineImageNode, ve.dm.MWImageNode );
--
To view, visit https://gerrit.wikimedia.org/r/348059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I32215873993a7e9a7f775ce3f39e2d378e0f31cd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
