jenkins-bot has submitted this change and it was merged.

Change subject: Added method getDataFromDomRecursionClean to ve.dm.Converter - 
used by nodes that handle their own children.
......................................................................


Added method getDataFromDomRecursionClean to ve.dm.Converter - used by nodes 
that handle their own children.

Change-Id: I604cf201515152824ec159b8c86f2010afcd3369
---
M modules/ve/dm/ve.dm.Converter.js
1 file changed, 20 insertions(+), 0 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve/dm/ve.dm.Converter.js b/modules/ve/dm/ve.dm.Converter.js
index 05425e8..fbfdbb2 100644
--- a/modules/ve/dm/ve.dm.Converter.js
+++ b/modules/ve/dm/ve.dm.Converter.js
@@ -354,6 +354,26 @@
 };
 
 /**
+ * Wrapper for getDataFromDomRecursion which resets contextStack before the 
call
+ * and then set it back after the call.
+ *
+ * TODO: This is kind of a hack, better implementation would be more 
appropriate in near future.
+ *
+ * @method
+ * @param {HTMLElement} domElement HTML element to convert
+ * @param {Object} [wrapperElement] Data element to wrap the returned data in
+ * @param {ve.dm.AnnotationSet} [annotationSet] Override the set of 
annotations to use
+ * @returns {Array} Linear model data
+ */
+ve.dm.Converter.prototype.getDataFromDomRecursionClean  = function ( 
domElement, wrapperElement, annotationSet ) {
+       var result, contextStack = this.contextStack;
+       this.contextStack = [];
+       result = this.getDataFromDomRecursion( domElement, wrapperElement, 
annotationSet );
+       this.contextStack = contextStack;
+       return result;
+};
+
+/**
  * Recursive implementation of getDataFromDom(). For internal use, and for use 
in
  * ve.dm.Model.static.toDataElement() implementations.
  *

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I604cf201515152824ec159b8c86f2010afcd3369
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Inez <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to