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

modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js

@@ -251,4 +251,5 @@ ve.dm.MWBlockImageNode.prototype.getCaptionNode = function () {
 
 /* Registration */
 
+ve.dm.modelRegistry.unregister( ve.dm.BlockImageNode );
 ve.dm.modelRegistry.register( ve.dm.MWBlockImageNode );

modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js

@@ -211,4 +211,5 @@ ve.dm.MWInlineImageNode.static.toDomElements = function ( data, doc ) {
 
 /* Registration */
 
+ve.dm.modelRegistry.unregister( ve.dm.InlineImageNode );
 ve.dm.modelRegistry.register( ve.dm.MWInlineImageNode );

modules/ve-mw/init/ve.init.mw.Target.js

@@ -240,7 +240,7 @@ ve.init.mw.Target.static.importRules = {
 			// Annotations
 			'link', 'textStyle/span', 'textStyle/font', 'textStyle/underline', 'meta/language',
 			// Nodes
-			'inlineImage', 'blockImage', 'div', 'alienInline', 'alienBlock', 'comment'
+			'div', 'alienInline', 'alienBlock', 'comment'
 		],
 		removeOriginalDomElements: true
 	},

modules/ve-mw/tests/ve.test.utils.js

@@ -37,7 +37,10 @@ ve.test.utils.mwEnvironment = ( function () {
 			ve.dm.MWPreformattedNode,
 			ve.dm.MWTableNode
 		],
-		overridden = [];
+		overridden = [
+			ve.dm.InlineImageNode,
+			ve.dm.BlockImageNode
+		];
 
 	function setupOverrides() {
 		var i;