[MediaWiki-commits] [Gerrit] mediawiki...WikiEditor[master]: Hide loading spinner also on API fail

2017-08-10 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/367686 )

Change subject: Hide loading spinner also on API fail
..


Hide loading spinner also on API fail

Change-Id: I65c1adf8058f2cd0a18466b0d92e43d5ec67d8f7
---
M modules/jquery.wikiEditor.preview.js
1 file changed, 5 insertions(+), 2 deletions(-)

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



diff --git a/modules/jquery.wikiEditor.preview.js 
b/modules/jquery.wikiEditor.preview.js
index faac2b8..d25dbd1 100644
--- a/modules/jquery.wikiEditor.preview.js
+++ b/modules/jquery.wikiEditor.preview.js
@@ -68,6 +68,8 @@
disableeditsection: 
true,
useskin: mw.config.get( 
'skin' ),
uselang: mw.config.get( 
'wgUserLanguage' )
+   } ).always( function () {
+   
context.modules.preview.$preview.find( '.wikiEditor-preview-loading' ).hide();
} ).done( function ( data ) {
var loadmodules, 
$content;
if ( !data.parse || 
!data.parse.text ) {
@@ -84,7 +86,6 @@
mw.loader.load( 
loadmodules );
 

context.modules.preview.previewText = wikitext;
-   
context.modules.preview.$preview.find( '.wikiEditor-preview-loading' ).hide();
$content = 
context.modules.preview.$preview.find( '.wikiEditor-preview-contents' )
.detach()
.html( 
data.parse.text );
@@ -126,6 +127,9 @@
postPromise = api.post( 
postdata );
 
$.when( postPromise, 
mw.loader.using( 'mediawiki.diff.styles' ) )
+   .always( function () {
+   
context.$changesTab.find( '.wikiEditor-preview-loading' ).hide();
+   } )
.done( function ( postResult ) {
var diff;
try {
@@ -141,7 +145,6 @@
} catch ( e ) {
// "data.blah 
is undefined" error, ignore
}
-   
context.$changesTab.find( '.wikiEditor-preview-loading' ).hide();
} );
}
} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I65c1adf8058f2cd0a18466b0d92e43d5ec67d8f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Fomafix 
Gerrit-Reviewer: TheDJ 
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...WikiEditor[master]: Hide loading spinner also on API fail

2017-07-25 Thread Fomafix (Code Review) 
Fomafix has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367686 )

Change subject: Hide loading spinner also on API fail
..

Hide loading spinner also on API fail

Change-Id: I65c1adf8058f2cd0a18466b0d92e43d5ec67d8f7
---
M modules/jquery.wikiEditor.preview.js
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor 
refs/changes/86/367686/1

diff --git a/modules/jquery.wikiEditor.preview.js 
b/modules/jquery.wikiEditor.preview.js
index faac2b8..d25dbd1 100644
--- a/modules/jquery.wikiEditor.preview.js
+++ b/modules/jquery.wikiEditor.preview.js
@@ -68,6 +68,8 @@
disableeditsection: 
true,
useskin: mw.config.get( 
'skin' ),
uselang: mw.config.get( 
'wgUserLanguage' )
+   } ).always( function () {
+   
context.modules.preview.$preview.find( '.wikiEditor-preview-loading' ).hide();
} ).done( function ( data ) {
var loadmodules, 
$content;
if ( !data.parse || 
!data.parse.text ) {
@@ -84,7 +86,6 @@
mw.loader.load( 
loadmodules );
 

context.modules.preview.previewText = wikitext;
-   
context.modules.preview.$preview.find( '.wikiEditor-preview-loading' ).hide();
$content = 
context.modules.preview.$preview.find( '.wikiEditor-preview-contents' )
.detach()
.html( 
data.parse.text );
@@ -126,6 +127,9 @@
postPromise = api.post( 
postdata );
 
$.when( postPromise, 
mw.loader.using( 'mediawiki.diff.styles' ) )
+   .always( function () {
+   
context.$changesTab.find( '.wikiEditor-preview-loading' ).hide();
+   } )
.done( function ( postResult ) {
var diff;
try {
@@ -141,7 +145,6 @@
} catch ( e ) {
// "data.blah 
is undefined" error, ignore
}
-   
context.$changesTab.find( '.wikiEditor-preview-loading' ).hide();
} );
}
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I65c1adf8058f2cd0a18466b0d92e43d5ec67d8f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: Fomafix 

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