jenkins-bot has submitted this change and it was merged.
Change subject: Clean up static stuff in dm.GeneratedContentNode
......................................................................
Clean up static stuff in dm.GeneratedContentNode
Remove enableAboutGrouping from GCNode and move it to the subclasses
so we can have GCNodes without grouping.
Having matchTagNames there doesn't make sense now that GCNode is a
mixin rather than a base class.
Also removed unused .static.generatedContent property.
Change-Id: I2b5350e70b7829cf009c752d066919e5a3593db0
---
M modules/ve/dm/nodes/ve.dm.AlienNode.js
M modules/ve/dm/nodes/ve.dm.GeneratedContentNode.js
M modules/ve/dm/nodes/ve.dm.MWTransclusionNode.js
3 files changed, 4 insertions(+), 7 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/dm/nodes/ve.dm.AlienNode.js
b/modules/ve/dm/nodes/ve.dm.AlienNode.js
index 16bfcfb..880dca7 100644
--- a/modules/ve/dm/nodes/ve.dm.AlienNode.js
+++ b/modules/ve/dm/nodes/ve.dm.AlienNode.js
@@ -37,8 +37,7 @@
ve.dm.AlienNode.static.storeHtmlAttributes = false;
-// TODO: Develop better method to test for generated content
-ve.dm.AlienNode.static.generatedContent = true;
+ve.dm.AlienNode.static.enableAboutGrouping = true;
ve.dm.AlienNode.static.toDataElement = function ( domElements, converter ) {
var isInline = this.isHybridInline( domElements, converter ),
diff --git a/modules/ve/dm/nodes/ve.dm.GeneratedContentNode.js
b/modules/ve/dm/nodes/ve.dm.GeneratedContentNode.js
index 9ef8518..bba784b 100644
--- a/modules/ve/dm/nodes/ve.dm.GeneratedContentNode.js
+++ b/modules/ve/dm/nodes/ve.dm.GeneratedContentNode.js
@@ -17,13 +17,9 @@
ve.dm.GeneratedContentNode = function VeDmGeneratedContentNode() {
};
-/* Static members */
+/* Static methods */
ve.dm.GeneratedContentNode.static = {};
-
-ve.dm.GeneratedContentNode.static.matchTagNames = [];
-
-ve.dm.GeneratedContentNode.static.enableAboutGrouping = true;
/**
* Store HTML of DOM elements, hashed on data element
diff --git a/modules/ve/dm/nodes/ve.dm.MWTransclusionNode.js
b/modules/ve/dm/nodes/ve.dm.MWTransclusionNode.js
index b6d96c1..94afb0d 100644
--- a/modules/ve/dm/nodes/ve.dm.MWTransclusionNode.js
+++ b/modules/ve/dm/nodes/ve.dm.MWTransclusionNode.js
@@ -51,6 +51,8 @@
) !== -1;
};
+ve.dm.MWTransclusionNode.static.enableAboutGrouping = true;
+
ve.dm.MWTransclusionNode.static.getHashObject = function ( dataElement ) {
return {
type: dataElement.type,
--
To view, visit https://gerrit.wikimedia.org/r/70198
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b5350e70b7829cf009c752d066919e5a3593db0
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
