[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Bypass API call when wikitext is empty string

2016-12-03 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Bypass API call when wikitext is empty string
..


Bypass API call when wikitext is empty string

Change-Id: Ie0cedfaae286f73e73bcde7bfca3cb2ae6197924
---
M modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
1 file changed, 17 insertions(+), 10 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js 
b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
index 79e037f..68c5850 100644
--- a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
+++ b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
@@ -152,16 +152,23 @@
  * @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 )
-   );
-   } );
+   var parsePromise;
+   if ( !source ) {
+   parsePromise = $.Deferred().resolve(
+   this.getDocument().shallowCloneFromRange( new ve.Range( 
0 ) )
+   ).promise();
+   } else {
+   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: Show progress bar without breaking WindowAction
// ve.init.target.getSurface().createProgress(

-- 
To view, visit https://gerrit.wikimedia.org/r/325111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0cedfaae286f73e73bcde7bfca3cb2ae6197924
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Bypass API call when wikitext is empty string

2016-12-03 Thread Esanders (Code Review) 
Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/325111

Change subject: Bypass API call when wikitext is empty string
..

Bypass API call when wikitext is empty string

Change-Id: Ie0cedfaae286f73e73bcde7bfca3cb2ae6197924
---
M modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
1 file changed, 17 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/11/325111/1

diff --git a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js 
b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
index 79e037f..68c5850 100644
--- a/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
+++ b/modules/ve-mw/dm/ve.dm.MWWikitextSurfaceFragment.js
@@ -152,16 +152,23 @@
  * @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 )
-   );
-   } );
+   var parsePromise;
+   if ( !source ) {
+   parsePromise = $.Deferred().resolve(
+   this.getDocument().shallowCloneFromRange( new ve.Range( 
0 ) )
+   ).promise();
+   } else {
+   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: Show progress bar without breaking WindowAction
// ve.init.target.getSurface().createProgress(

-- 
To view, visit https://gerrit.wikimedia.org/r/325111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0cedfaae286f73e73bcde7bfca3cb2ae6197924
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits