jenkins-bot has submitted this change and it was merged.
Change subject: Update VE core submodule to master (5be61ce)
......................................................................
Update VE core submodule to master (5be61ce)
New changes:
860954b [BREAKING CHANGE] Parse selection before applying source tools
Local changes:
Implement convertFromSource/convertToSource in WikitextSurfaceFragment
Depends-On: Iaa41c49e2f8e28af28a8a64cb6915f705fa35e8c
Change-Id: I746619d442fb565cd582cb09de3126526c73c333
---
M lib/ve
M modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
2 files changed, 29 insertions(+), 2 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/ve b/lib/ve
index af7fb69..5be61ce 160000
--- a/lib/ve
+++ b/lib/ve
@@ -1 +1 @@
-Subproject commit af7fb69686ed2dbd4cf44731a22434c7f22b9ef3
+Subproject commit 5be61ced8835cb1034e2789bbb29d20dfb6ee98d
diff --git a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
index 2a2be95..1e2afe0 100644
--- a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
+++ b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
@@ -127,7 +127,7 @@
/**
* @inheritdoc
*/
-ve.dm.MWWikitextSurfaceFragment.prototype.convertDocument = function ( doc ) {
+ve.dm.MWWikitextSurfaceFragment.prototype.convertToSource = function ( doc ) {
var wikitextPromise;
if ( !doc.data.hasContent() ) {
@@ -147,3 +147,30 @@
return wikitextPromise;
};
+
+/**
+ * @inheritdoc
+ */
+ve.dm.MWWikitextSurfaceFragment.prototype.convertFromSource = function (
source ) {
+ var parsePromise = new mw.Api().post( {
+ action: 'visualeditor',
+ paction: 'parsefragment',
+ page: mw.config.get( 'wgRelevantPageName' ),
+ wikitext: source
+ } ).then( function ( response ) {
+ return ve.dm.converter.getModelFromDom(
+ ve.createDocumentFromHtml(
response.visualeditor.content )
+ );
+ } );
+
+ // TODO: Emit an event to trigger the progress bar
+ ve.init.target.getSurface().createProgress(
+ parsePromise, ve.msg(
'visualeditor-generating-wikitext-progress' )
+ ).done( function ( progressBar, cancelPromise ) {
+ cancelPromise.fail( function () {
+ parsePromise.abort();
+ } );
+ } );
+
+ return parsePromise;
+};
--
To view, visit https://gerrit.wikimedia.org/r/324821
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I746619d442fb565cd582cb09de3126526c73c333
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
