[MediaWiki-commits] [Gerrit] Move relocatable mixin to MWInlineImage - change (mediawiki...VisualEditor)

[Esanders (Code Review)]

Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/116118

Change subject: Move relocatable mixin to MWInlineImage
......................................................................

Move relocatable mixin to MWInlineImage

Reloactable doesn't work with block nodes yet, so don't pretend it will.

Change-Id: I435e8836fbb6983d200db647febac6cc67bec6ca
---
M modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js
M modules/ve-mw/ce/nodes/ve.ce.MWInlineImageNode.js
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/18/116118/1

diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js
index 152d8f6..3db4327 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js
@@ -15,7 +15,6 @@
  * @extends ve.ce.GeneratedContentNode
  * @mixins ve.ce.ProtectedNode
  * @mixins ve.ce.FocusableNode
- * @mixins ve.ce.RelocatableNode
  * @mixins ve.ce.MWResizableNode
  *
  * @constructor
@@ -38,7 +37,6 @@
        // Mixin constructors
        ve.ce.ProtectedNode.call( this, this.$figure, config );
        ve.ce.FocusableNode.call( this, this.$figure, config );
-       ve.ce.RelocatableNode.call( this, this.$figure, config );
        ve.ce.MWResizableNode.call( this, this.$image, config );
 
        // Events
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWInlineImageNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWInlineImageNode.js
index 5d39f6f..c63ca71 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWInlineImageNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWInlineImageNode.js
@@ -11,6 +11,7 @@
  * @class
  * @extends ve.ce.LeafNode
  * @mixins ve.ce.MWImageNode
+ * @mixins ve.ce.RelocatableNode
  *
  * @constructor
  * @param {ve.dm.MWInlineImageNode} model Model to observe
@@ -35,6 +36,7 @@
 
        // Mixin constructors
        ve.ce.MWImageNode.call( this, this.$element, this.$image );
+       ve.ce.RelocatableNode.call( this, this.$figure, config );
 
        this.$image
                .attr( 'src', this.getResolvedAttribute( 'src' ) )

-- 
To view, visit https://gerrit.wikimedia.org/r/116118
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I435e8836fbb6983d200db647febac6cc67bec6ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits