Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/256443
Change subject: Abort previous unfinished API request before sending new request
......................................................................
Abort previous unfinished API request before sending new request
This change requires 81171ab3 from core included in MediaWiki 1.27.
Change-Id: I8dec32bf49e412510cf5d98f2f946bfd337f47a1
---
M modules/jquery.codeEditor.js
1 file changed, 14 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor
refs/changes/43/256443/1
diff --git a/modules/jquery.codeEditor.js b/modules/jquery.codeEditor.js
index ca12d28..555aa96 100644
--- a/modules/jquery.codeEditor.js
+++ b/modules/jquery.codeEditor.js
@@ -48,7 +48,8 @@
selectedLine = 0,
cookieEnabled,
returnFalse = function () { return false; },
- extIconPath = mw.config.get( 'wgCodeEditorAssetsPath',
mw.config.get( 'wgExtensionAssetsPath' ) ) + '/CodeEditor/images/';
+ extIconPath = mw.config.get( 'wgCodeEditorAssetsPath',
mw.config.get( 'wgExtensionAssetsPath' ) ) + '/CodeEditor/images/',
+ api = new mw.Api();
// Initialize state
cookieEnabled = parseInt( mw.cookie.get( 'codeEditor-' +
context.instance + '-showInvisibleChars' ), 10 );
@@ -293,14 +294,24 @@
context.fn.updateButtonIcon( 'lineWrapping',
context.fn.lineWrappingToolbarIcon );
},
setCodeEditorPreference: function ( prefValue ) {
- var api = new mw.Api();
// Do not try to save options for anonymous user
if ( mw.user.isAnon() ) {
return;
}
+
+ // Abort any previous request
+ api.abort();
+
api.saveOption( 'usecodeeditor', prefValue ? 1
: 0 )
.fail( function ( code, result ) {
- var message = 'Failed to set code
editor preference: ' + code;
+ var message;
+
+ if ( code === 'http' &&
result.textStatus === 'abort' ) {
+ // Request was aborted. Ignore
error
+ return;
+ }
+
+ message = 'Failed to set code editor
preference: ' + code;
if ( result.error && result.error.info
) {
message += '\n' +
result.error.info;
}
--
To view, visit https://gerrit.wikimedia.org/r/256443
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8dec32bf49e412510cf5d98f2f946bfd337f47a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader <gerritpatchuploa...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
