Mooeypoo has uploaded a new change for review. https://gerrit.wikimedia.org/r/196274
Change subject: Remove MWTransclusionMetaNode ...................................................................... Remove MWTransclusionMetaNode Since all transclusion nodes can be interacted with (including the 'hidden' ones,) there is no need for MWTransclusionMetaNodes. Change-Id: I23d37e3d82029b7475ec68ebb04883c7e05370cc --- M VisualEditor.php M extension.json D modules/ve-mw/dm/metaitems/ve.dm.MWTransclusionMetaItem.js M modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js 4 files changed, 0 insertions(+), 44 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/74/196274/1 diff --git a/VisualEditor.php b/VisualEditor.php index 095758c..376e9f3 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -1325,8 +1325,6 @@ 'scripts' => array( 'modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js', - 'modules/ve-mw/dm/metaitems/ve.dm.MWTransclusionMetaItem.js', - 'modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js', ), 'styles' => array( diff --git a/extension.json b/extension.json index 50b01b5..8462a6f 100644 --- a/extension.json +++ b/extension.json @@ -1349,7 +1349,6 @@ "ext.visualEditor.mwtransclusion.core": { "scripts": [ "modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js", - "modules/ve-mw/dm/metaitems/ve.dm.MWTransclusionMetaItem.js", "modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js" ], "dependencies": [ diff --git a/modules/ve-mw/dm/metaitems/ve.dm.MWTransclusionMetaItem.js b/modules/ve-mw/dm/metaitems/ve.dm.MWTransclusionMetaItem.js deleted file mode 100644 index 115f1a6..0000000 --- a/modules/ve-mw/dm/metaitems/ve.dm.MWTransclusionMetaItem.js +++ /dev/null @@ -1,37 +0,0 @@ -/*! - * VisualEditor DataModel MWTransclusionMetaItem class. - * - * @copyright 2011-2015 VisualEditor Team and others; see AUTHORS.txt - * @license The MIT License (MIT); see LICENSE.txt - */ - -/** - * DataModel MW-specific meta item. - * - * @class - * @abstract - * @extends ve.dm.AlienMetaItem - * @constructor - * @param {Object} element Reference to element in meta-linmod - */ -ve.dm.MWTransclusionMetaItem = function VeDmMWTransclusionMetaItem( element ) { - // Parent constructor - ve.dm.AlienMetaItem.call( this, element ); -}; - -/* Inheritance */ - -OO.inheritClass( ve.dm.MWTransclusionMetaItem, ve.dm.AlienMetaItem ); - -/* Static Properties */ - -ve.dm.MWTransclusionMetaItem.static.name = 'mwTransclusionMeta'; - -ve.dm.MWTransclusionMetaItem.static.matchTagNames = []; - -// mwTransclusionMetaItems are generated by ve.dm.MWTransclusionNode#toDataElement when -// all of the transclusions contents are considered to be metadata or whitespace - -/* Registration */ - -ve.dm.modelRegistry.register( ve.dm.MWTransclusionMetaItem ); diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js index 677fe48..f4e18bd 100644 --- a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js +++ b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js @@ -69,10 +69,6 @@ }; ve.dm.MWTransclusionNode.static.toDataElement = function ( domElements, converter ) { - if ( converter.isDomAllMetaOrWhitespace( domElements, ['mwTransclusion', 'mwTransclusionInline', 'mwTransclusionBlock'] ) ) { - return ve.dm.MWTransclusionMetaItem.static.toDataElement( domElements, converter ); - } - var dataElement, index, mwDataJSON = domElements[0].getAttribute( 'data-mw' ), mwData = mwDataJSON ? JSON.parse( mwDataJSON ) : {}, -- To view, visit https://gerrit.wikimedia.org/r/196274 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I23d37e3d82029b7475ec68ebb04883c7e05370cc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Mooeypoo <mor...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits