[MediaWiki-commits] [Gerrit] Prefetch wikitext on summary screen - change (mediawiki...MobileFrontend)

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

Change subject: Prefetch wikitext on summary screen
..


Prefetch wikitext on summary screen

This reflects recent changes to the save method in the mw.target module
Exchange html to wikitext from parsoid in the summary view,
once fetched, the submit (or save) button becomes enabled.


Change-Id: I81191b3e8895b0041ab08c6b1e15589ca5656e88
---
M javascripts/modules/editor/VisualEditorOverlay.js
1 file changed, 17 insertions(+), 8 deletions(-)

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



diff --git a/javascripts/modules/editor/VisualEditorOverlay.js 
b/javascripts/modules/editor/VisualEditorOverlay.js
index 6501506..f78a81c 100644
--- a/javascripts/modules/editor/VisualEditorOverlay.js
+++ b/javascripts/modules/editor/VisualEditorOverlay.js
@@ -14,7 +14,6 @@
summaryMsg: mw.msg( 
'mobile-frontend-editor-summary-placeholder' ),
licenseMsg: mw.msg( 'mobile-frontend-editor-license' )
},
-
initialize: function( options ) {
var self = this;
this.hasChanged = false;
@@ -33,20 +32,30 @@
this._super( options );
},
prepareForSave: function() {
-   this._showHidden( '.save-header, .save-panel' );
+   var self = this,
+   doc = 
this.target.surface.getModel().getDocument();
+   // Disable VE surface
+   this.target.surface.getView().disable();
+   self._showHidden( '.save-header, .save-panel' );
+   self.$( '.submit' ).prop( 'disabled', true );
+   this.$spinner.show();
+   // Preload the serialization
+   if ( !this.docToSave ) {
+   this.docToSave = 
ve.dm.converter.getDomFromModel( doc );
+   }
+   this.target.prepareCacheKey( this.docToSave ).done( 
function () {
+   self.clearSpinner();
+   self.$( '.submit' ).prop( 'disabled', false );
+   } );
},
save: function() {
-   var doc = this.target.surface.getModel().getDocument(),
-   summary = this.$( '.save-panel input' ).val();
+   var summary = this.$( '.save-panel input' ).val();
 
this.$spinner.show();
// Stop the confirmation message from being thrown when 
you hit save.
this.canHide = true;
this.$( '.surface, .summary-area' ).hide();
-   this.target.save(
-   ve.dm.converter.getDomFromData( 
doc.getFullData(), doc.getStore(), doc.getInternalList(), 
doc.getInnerWhitespace() ),
-   { 'summary': summary }
-   );
+   this.target.save( this.docToSave, { 'summary': summary 
} );
},
clearSpinner: function() {
this.$spinner.hide();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I81191b3e8895b0041ab08c6b1e15589ca5656e88
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Robmoen 
Gerrit-Reviewer: JGonera 
Gerrit-Reviewer: Robmoen 
Gerrit-Reviewer: jenkins-bot

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

[MediaWiki-commits] [Gerrit] Prefetch wikitext on summary screen - change (mediawiki...MobileFrontend)

2013-12-05 Thread Robmoen (Code Review) 
Robmoen has uploaded a new change for review.

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


Change subject: Prefetch wikitext on summary screen
..

Prefetch wikitext on summary screen

This reflects recent major changes to the save method in the mw.target module
It is now standard to fetch the wikitext from parsoid in the summary view,
once fetched, the submit (or save) button becomes active.

Change-Id: I81191b3e8895b0041ab08c6b1e15589ca5656e88
---
M javascripts/modules/editor/VisualEditorOverlay.js
1 file changed, 15 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/91/99591/1

diff --git a/javascripts/modules/editor/VisualEditorOverlay.js 
b/javascripts/modules/editor/VisualEditorOverlay.js
index 6501506..d6e8d2d 100644
--- a/javascripts/modules/editor/VisualEditorOverlay.js
+++ b/javascripts/modules/editor/VisualEditorOverlay.js
@@ -14,7 +14,6 @@
summaryMsg: mw.msg( 
'mobile-frontend-editor-summary-placeholder' ),
licenseMsg: mw.msg( 'mobile-frontend-editor-license' )
},
-
initialize: function( options ) {
var self = this;
this.hasChanged = false;
@@ -33,20 +32,28 @@
this._super( options );
},
prepareForSave: function() {
-   this._showHidden( '.save-header, .save-panel' );
+   var self = this,
+   doc = 
this.target.surface.getModel().getDocument();
+   // Disable VE surface
+   this.target.surface.getView().disable();
+   self._showHidden( '.save-header, .save-panel' );
+   self.$( '.save' ).prop( 'disabled', true );
+   // Preload the serialization
+   if ( !this.docToSave ) {
+   this.docToSave = 
ve.dm.converter.getDomFromModel( doc );
+   }
+   this.target.prepareCacheKey( this.docToSave ).done( 
function () {
+   self.$( '.continue' ).prop( 'disabled', false );
+   } );
},
save: function() {
-   var doc = this.target.surface.getModel().getDocument(),
-   summary = this.$( '.save-panel input' ).val();
+   var summary = this.$( '.save-panel input' ).val();
 
this.$spinner.show();
// Stop the confirmation message from being thrown when 
you hit save.
this.canHide = true;
this.$( '.surface, .summary-area' ).hide();
-   this.target.save(
-   ve.dm.converter.getDomFromData( 
doc.getFullData(), doc.getStore(), doc.getInternalList(), 
doc.getInnerWhitespace() ),
-   { 'summary': summary }
-   );
+   this.target.save( this.docToSave, { 'summary': summary 
} );
},
clearSpinner: function() {
this.$spinner.hide();

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81191b3e8895b0041ab08c6b1e15589ca5656e88
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Robmoen 

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