wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-28 16:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Properly clone the document for the sanity check"

Browse source
This commit is contained in:
jenkins-bot 2013-07-29 19:45:02 +00:00 committed by Gerrit Code Review
parent 3040a4ef60 be9495d31e
commit 9c77d14c29
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
View file

@ -1111,11 +1111,11 @@ ve.init.mw.ViewPageTarget.prototype.setUpSurface = function ( doc, callback ) {
* (it's asynchronous, so it may still be pending when you check). * (it's asynchronous, so it may still be pending when you check).
*/ */
ve.init.mw.ViewPageTarget.prototype.startSanityCheck = function () { ve.init.mw.ViewPageTarget.prototype.startSanityCheck = function () {
// We have to get the converted DOM now, before we unlock the surface and let the user edit, // We have to get a copy of the data now, before we unlock the surface and let the user edit,
// but we can defer the actual comparison // but we can defer the actual conversion and comparison
var viewPage = this, var viewPage = this,
doc = viewPage.surface.getModel().getDocument(), doc = viewPage.surface.getModel().getDocument(),
data = ve.copyArray( doc.getFullData() ), data = new ve.dm.ElementLinearData( doc.getStore().clone(), ve.copyArray( doc.getFullData() ) ),
oldDom = viewPage.doc, oldDom = viewPage.doc,
d = $.Deferred(); d = $.Deferred();
@ -1128,7 +1128,8 @@ ve.init.mw.ViewPageTarget.prototype.startSanityCheck = function () {
// <body> were ignored in the conversion. So compare each child separately. // <body> were ignored in the conversion. So compare each child separately.
var i, var i,
len = oldDom.body.childNodes.length, len = oldDom.body.childNodes.length,
newDom = ve.dm.converter.getDomFromData( data, doc.getStore(), doc.getInternalList() ); newDoc = new ve.dm.Document( data, undefined, doc.getInternalList() ),
newDom = ve.dm.converter.getDomFromData( newDoc.getFullData(), newDoc.getStore(), newDoc.getInternalList() );
// Explicitly unlink our full copy of the original version of the document data // Explicitly unlink our full copy of the original version of the document data
data = undefined; data = undefined;