wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-28 16:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Follow-up 2c24efae: fix typo in event name for unknown save errors"

Browse source
This commit is contained in:
jenkins-bot 2016-03-05 02:01:57 +00:00 committed by Gerrit Code Review
parent 022d7c2694 84d534997e
commit 074885d7cf
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/ve-mw/init/ve.init.mw.ArticleTarget.js
View file

@ -120,6 +120,7 @@ OO.inheritClass( ve.init.mw.ArticleTarget, ve.init.mw.Target );
/**
* @event saveErrorUnknown
* @param {string} errorMsg Error message shown to the user
* Fired for any other type of save error
*/
@ -654,20 +655,20 @@ ve.init.mw.ArticleTarget.prototype.saveErrorNewUser = function ( username ) {
* @method
* @param {Object} editApi
* @param {Object|null} data API response data
* @fires onSaveErrorUnknown
* @fires saveErrorUnknown
*/
ve.init.mw.ArticleTarget.prototype.saveErrorUnknown = function ( editApi, data ) {
var errorMsg = ( editApi && editApi.info ) ||
( data && data.error && data.error.info ) ||
( editApi && editApi.code ) ||
( data && data.error && data.error.code ) ||
'Unknown error';
this.showSaveError(
$( document.createTextNode(
( editApi && editApi.info ) ||
( data.error && data.error.info ) ||
( editApi && editApi.code ) ||
( data.error && data.error.code ) ||
'Unknown error'
) ),
$( document.createTextNode( errorMsg ) ),
false // prevents reapply
);
this.emit( 'onSaveErrorUnknown' );
this.emit( 'saveErrorUnknown', errorMsg );
};
/**

4
modules/ve-mw/init/ve.init.mw.ArticleTargetEvents.js
View file

@ -149,8 +149,8 @@ ve.init.mw.ArticleTargetEvents.prototype.trackSaveError = function ( type ) {
type: typeMap[ type ] || 'responseUnknown',
timing: ve.now() - this.timings.saveInitiated + ( this.timings.serializeForCache || 0 )
};
if ( type === 'unknown' && failureArguments[ 1 ].error && failureArguments[ 1 ].error.code ) {
data.message = failureArguments[ 1 ].error.code;
if ( type === 'unknown' && failureArguments[ 1 ] ) {
data.message = failureArguments[ 1 ];
}
ve.track( 'mwedit.saveFailure', data );
};