Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/211422
Change subject: Unregister core image types
......................................................................
Unregister core image types
Once MW images are registered, we should remove core image support so
we don't accidentally match to them (e.g. an MW inline image with an
unsupported extra RDFa type).
Change-Id: I1c8567346c371fe338f95b232c9ac53e009c5a46
---
M modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
M modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
M modules/ve-mw/init/ve.init.mw.Target.js
3 files changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/22/211422/1
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
index 0b5e5b5..e16bbbc 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
@@ -252,4 +252,5 @@
/* Registration */
+ve.dm.modelRegistry.unregister( ve.dm.BlockImageNode );
ve.dm.modelRegistry.register( ve.dm.MWBlockImageNode );
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
index d6e3650..0ff92eb 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
@@ -199,4 +199,5 @@
/* Registration */
+ve.dm.modelRegistry.unregister( ve.dm.InlineImageNode );
ve.dm.modelRegistry.register( ve.dm.MWInlineImageNode );
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 109f685..b52abbb 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -240,7 +240,7 @@
// Annotations
'link', 'textStyle/span', 'textStyle/font',
'textStyle/underline', 'meta/language',
// Nodes
- 'inlineImage', 'blockImage', 'div', 'alienInline',
'alienBlock', 'comment'
+ 'div', 'alienInline', 'alienBlock', 'comment'
],
removeOriginalDomElements: true
},
--
To view, visit https://gerrit.wikimedia.org/r/211422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c8567346c371fe338f95b232c9ac53e009c5a46
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
