jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/357813 )
Change subject: Use static parseDocument method
......................................................................
Use static parseDocument method
Change-Id: I545a58ffcbf1c7c57c197f4858958de835a40394
Depends-On: I5b36e187a5e8bb68b47b2fccf5b46c08b81b01d9
---
M build/screenshots.diffs.js
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
3 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, but someone else must approve
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/build/screenshots.diffs.js b/build/screenshots.diffs.js
index f8c168a..2aac6fc 100644
--- a/build/screenshots.diffs.js
+++ b/build/screenshots.diffs.js
@@ -21,12 +21,12 @@
}
}
- target.originalDmDoc =
target.constructor.static.createModelFromDom( target.parseDocument( oldHtml ),
'visual' );
+ target.originalDmDoc =
target.constructor.static.createModelFromDom(
target.constructor.static.parseDocument( oldHtml ), 'visual' );
surface.getModel().getDocument().getStore().merge(
target.originalDmDoc.getStore() );
surface.getModel().getLinearFragment( new ve.Range( 0 )
).insertDocument(
- target.constructor.static.createModelFromDom(
target.parseDocument( newHtml ), 'visual' )
+ target.constructor.static.createModelFromDom(
target.constructor.static.parseDocument( newHtml ), 'visual' )
).collapseToEnd().adjustLinearSelection( 0, 3
).removeContent();
target.once( 'saveReview', function () {
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index eae257b..8605460 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -271,7 +271,7 @@
this.etag = data.etag;
this.fromEditedState = data.fromEditedState;
this.switched = data.switched || 'wteswitched' in new mw.Uri(
location.href ).query;
- this.doc = this.parseDocument( this.originalHtml,
this.getDefaultMode() );
+ this.doc = this.constructor.static.parseDocument(
this.originalHtml, this.getDefaultMode() );
this.remoteNotices = ve.getObjectValues( data.notices );
this.protectedClasses = data.protectedClasses;
@@ -1000,7 +1000,7 @@
baseDoc =
target.getSurface().getModel().getDocument().getHtmlDocument();
if ( ve.getProp( response, 'visualeditor', 'result' )
=== 'success' ) {
- doc = target.parseDocument(
response.visualeditor.content, 'visual' );
+ doc = target.constructor.static.parseDocument(
response.visualeditor.content, 'visual' );
body = doc.body;
// Import body to current document, then
resolve attributes against original document (parseDocument called #fixBase)
document.adoptNode( body );
@@ -1079,7 +1079,7 @@
).then( function ( response ) {
var doc, data = response ? (
response.visualeditor || response.visualeditoredit ) : null;
if ( data && typeof data.content === 'string' )
{
- doc = target.parseDocument(
data.content, 'visual' );
+ doc =
target.constructor.static.parseDocument( data.content, 'visual' );
target.originalDmDoc =
target.constructor.static.createModelFromDom( doc, 'visual' );
deferred.resolve( function () {
return new ve.dm.VisualDiff(
target.originalDmDoc, dmDoc );
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index b0fa020..160b5c8 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -185,26 +185,26 @@
return this.constructor.static.createModelFromDom.apply(
this.constructor.static, arguments );
};
-/* Methods */
-
/**
* @inheritdoc
*/
-ve.init.mw.Target.prototype.parseDocument = function ( documentString, mode ) {
+ve.init.mw.Target.static.parseDocument = function ( documentString, mode ) {
var doc;
if ( mode === 'source' ) {
// Parent method
- doc = ve.init.mw.Target.super.prototype.parseDocument.apply(
this, arguments );
+ doc = ve.init.mw.Target.super.static.parseDocument.apply( this,
arguments );
} else {
// Parsoid documents are XHTML so we can use parseXhtml which
fixed some IE issues.
doc = ve.parseXhtml( documentString );
}
// Fix relative or missing base URL if needed
- this.constructor.static.fixBase( doc );
+ this.fixBase( doc );
return doc;
};
+/* Methods */
+
/**
* Handle both DOM and modules being loaded and ready.
*
--
To view, visit https://gerrit.wikimedia.org/r/357813
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I545a58ffcbf1c7c57c197f4858958de835a40394
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
