wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-24 22:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Copy DOM elements properly, into the correct document"

Browse source
This commit is contained in:
jenkins-bot 2013-06-18 22:52:14 +00:00 committed by Gerrit Code Review
parent c4791ceeae dc798befcf
commit 60da007ab9
5 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/ve/ce/nodes/ve.ce.GeneratedContentNode.js
View file

@ -41,9 +41,7 @@ ve.ce.GeneratedContentNode.prototype.onUpdate = function () {
this.emit( 'teardown' );
}
this.$.empty().append(
this.$$( store.value( index ) ).map( function ( i, domElement ) {
return doc.importNode( domElement, true );
} )
ve.copyDomElements( store.value( index ), doc )
);
if ( this.live ) {
this.emit( 'setup' );

4
modules/ve/dm/metaitems/ve.dm.AlienMetaItem.js
View file

@ -39,8 +39,8 @@ ve.dm.AlienMetaItem.static.toDataElement = function ( domElements ) {
};
};
ve.dm.AlienMetaItem.static.toDomElements = function ( dataElement ) {
return dataElement.attributes.domElements;
ve.dm.AlienMetaItem.static.toDomElements = function ( dataElement, doc ) {
return ve.copyDomElements( dataElement.attributes.domElements, doc );
};
/* Registration */

4
modules/ve/dm/nodes/ve.dm.AlienNode.js
View file

@ -52,8 +52,8 @@ ve.dm.AlienNode.static.toDataElement = function ( domElements, converter ) {
};
};
ve.dm.AlienNode.static.toDomElements = function ( dataElement ) {
return dataElement.attributes.domElements;
ve.dm.AlienNode.static.toDomElements = function ( dataElement, doc ) {
return ve.copyDomElements( dataElement.attributes.domElements, doc );
};
/* Concrete subclasses */

4
modules/ve/dm/nodes/ve.dm.MWReferenceListNode.js
View file

@ -47,8 +47,8 @@ ve.dm.MWReferenceListNode.static.toDataElement = function ( domElements ) {
};
};
ve.dm.MWReferenceListNode.static.toDomElements = function ( dataElement ) {
return dataElement.attributes.domElements;
ve.dm.MWReferenceListNode.static.toDomElements = function ( dataElement, doc ) {
return ve.copyDomElements( dataElement.attributes.domElements, doc );
};
/* Registration */

13
modules/ve/ve.js
View file

@ -105,6 +105,19 @@
*/
ve.copyObject = oo.copy;
/**
* Copy an array of DOM elements, optionally into a different document.
*
* @param {HTMLElement[]} domElements DOM elements to copy
* @param {HTMLDocument} [doc] Document to create the copies in; if unset, simply clone each element
* @return {HTMLElement[]} Copy of domElements with copies of each element
*/
ve.copyDomElements = function ( domElements, doc ) {
return domElements.map( function ( domElement ) {
return doc ? doc.importNode( domElement, true ) : domElement.cloneNode( true );
} );
};
/**
* Check to see if an object is a plain object (created using "{}" or "new Object").
*