jenkins-bot has submitted this change and it was merged.
Change subject: Defer conversion in the sanity check
......................................................................
Defer conversion in the sanity check
Conversion is apparently pretty slow on large articles, so put it inside
the setTimeout(). We still need to copy the data array synchronously
though.
Change-Id: Ic0c6d190c9b782f8c643d00d335f0e004d860bcf
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index e3856d8..a1ddd79 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -920,7 +920,7 @@
// but we can defer the actual comparison
var viewPage = this,
doc = viewPage.surface.getModel().getDocument(),
- newDom = ve.dm.converter.getDomFromData( doc.getFullData(),
doc.getStore(), doc.getInternalList() ),
+ data = ve.copyArray( doc.getFullData() ),
oldDom = viewPage.doc,
d = $.Deferred();
@@ -932,7 +932,9 @@
// We can't compare oldDom.body and newDom.body directly,
because the attributes on the
// <body> were ignored in the conversion. So compare each child
separately.
var i,
- len = oldDom.body.childNodes.length;
+ len = oldDom.body.childNodes.length,
+ newDom = ve.dm.converter.getDomFromData( data,
doc.getStore(), doc.getInternalList() );
+
if ( len !== newDom.body.childNodes.length ) {
// Different number of children, so they're definitely
different
d.reject();
--
To view, visit https://gerrit.wikimedia.org/r/72771
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0c6d190c9b782f8c643d00d335f0e004d860bcf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
