Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/69435
Change subject: Fix copyDomElement issues
......................................................................
Fix copyDomElement issues
* Fix bug in MWTransclusionNode sometimes passing a NodeList rather
than an array (caused an error because NodeLists can't be .map()ped)
* Use copyDomElement in ce.AlienNode as well
Change-Id: I11c6483d3c062047be80f75a3fac03f13bff9662
---
M modules/ve/ce/nodes/ve.ce.AlienNode.js
M modules/ve/ce/nodes/ve.ce.MWTransclusionNode.js
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/35/69435/1
diff --git a/modules/ve/ce/nodes/ve.ce.AlienNode.js
b/modules/ve/ce/nodes/ve.ce.AlienNode.js
index f651f3a..ce64ab0 100644
--- a/modules/ve/ce/nodes/ve.ce.AlienNode.js
+++ b/modules/ve/ce/nodes/ve.ce.AlienNode.js
@@ -54,7 +54,8 @@
* @method
*/
ve.ce.AlienNode.prototype.onUpdate = function () {
- this.$.html( ve.copyArray( this.model.getAttribute( 'domElements' ) ||
[] ) );
+ // TODO use GeneratedContentNode the way it was meant to be used
+ this.$.html( ve.copyDomElements( this.model.getAttribute( 'domElements'
) || [], this.getElementDocument() ) );
};
/* Concrete subclasses */
diff --git a/modules/ve/ce/nodes/ve.ce.MWTransclusionNode.js
b/modules/ve/ce/nodes/ve.ce.MWTransclusionNode.js
index d61c631..1fe9848 100644
--- a/modules/ve/ce/nodes/ve.ce.MWTransclusionNode.js
+++ b/modules/ve/ce/nodes/ve.ce.MWTransclusionNode.js
@@ -85,7 +85,7 @@
// We have to do this because the PHP parser wraps everything in <p>s,
and inline templates
// will render strangely when wrapped in <p>s.
if ( contentNodes.length === 1 &&
contentNodes[0].nodeName.toLowerCase() === 'p' ) {
- contentNodes = contentNodes[0].childNodes;
+ contentNodes = Array.prototype.slice.apply(
contentNodes[0].childNodes );
}
deferred.resolve( contentNodes );
};
--
To view, visit https://gerrit.wikimedia.org/r/69435
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I11c6483d3c062047be80f75a3fac03f13bff9662
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <roan.katt...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
