jenkins-bot has submitted this change and it was merged.
Change subject: Check that response.error exists before using it
......................................................................
Check that response.error exists before using it
This should fix an annoying problem which happens if
* You have the chrome developer toolbar open
* It is set to pause on errors
* You refresh or navigate away while there is running ajax request
Change-Id: I349a7b956e34f0f07e071c27ecf8e14455200c18
---
M resources/js/ext.translate.editor.helpers.js
M resources/js/ext.translate.messagetable.js
2 files changed, 7 insertions(+), 5 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.editor.helpers.js
b/resources/js/ext.translate.editor.helpers.js
index b002731..c8d086f 100644
--- a/resources/js/ext.translate.editor.helpers.js
+++ b/resources/js/ext.translate.editor.helpers.js
@@ -61,7 +61,7 @@
.replace( /\/[a-z\-]+$/, '/' +
mw.config.get( 'wgTranslateDocumentationLanguageCode' ) ),
text: newDocumentation,
token: mw.user.tokens.get( 'editToken' )
- } ).done(function ( response ) {
+ } ).done( function ( response ) {
var $messageDesc =
translateEditor.$editor.find( '.infocolumn-block .message-desc' );
if ( response.edit.result === 'Success' ) {
@@ -80,10 +80,12 @@
translateEditor.hideDocumentationEditor();
} else {
- mw.log( 'Problem saving documentation'
);
+ mw.notify( 'Error saving message
documentation' );
+ mw.log( 'Error saving documentation',
response );
}
} ).fail( function ( errorCode, results ) {
- mw.log( 'Error saving documentation ' +
errorCode + ' ' + results.error.info );
+ mw.notify( 'Error saving message documentation'
);
+ mw.log( 'Error saving documentation',
errorCode, results );
} );
},
@@ -481,7 +483,7 @@
mw.translateHooks.run(
'showTranslationHelpers', result.helpers, translateEditor.$editor );
} ).fail( function ( errorCode, results ) {
- mw.log( 'Error loading translation aids ' +
errorCode + results.error.info );
+ mw.log( 'Error loading translation aids',
errorCode, results );
} );
}
};
diff --git a/resources/js/ext.translate.messagetable.js
b/resources/js/ext.translate.messagetable.js
index 70671e7..65a0f0e 100644
--- a/resources/js/ext.translate.messagetable.js
+++ b/resources/js/ext.translate.messagetable.js
@@ -480,7 +480,7 @@
messageTable.updateLastMessage();
} )
.fail( function ( errorCode, response ) {
- if ( response.error.code ===
'mctranslate-language-disabled' ) {
+ if ( response.error &&
response.error.code === 'mctranslate-language-disabled' ) {
$( '.tux-editor-header
.group-warning' )
.text( mw.msg(
'translate-language-disabled' ) )
.show();
--
To view, visit https://gerrit.wikimedia.org/r/69975
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I349a7b956e34f0f07e071c27ecf8e14455200c18
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
Gerrit-Reviewer: Santhosh <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
