jenkins-bot has submitted this change and it was merged.
Change subject: Follow-up 2c24efae: fix typo in event name for unknown save
errors
..
Follow-up 2c24efae: fix typo in event name for unknown save errors
This probably means we stopped logging unknown save errors
back in August.
Change-Id: I4a5bac244a469e73643e8a7d978d9212dd838fb0
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
M modules/ve-mw/init/ve.init.mw.ArticleTargetEvents.js
2 files changed, 12 insertions(+), 11 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 6ec0510..8a6e234 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -120,6 +120,7 @@
/**
* @event saveErrorUnknown
+ * @param {string} errorMsg Error message shown to the user
* Fired for any other type of save error
*/
@@ -654,20 +655,20 @@
* @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 );
};
/**
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTargetEvents.js
b/modules/ve-mw/init/ve.init.mw.ArticleTargetEvents.js
index 2567023..c6c10f8 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTargetEvents.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTargetEvents.js
@@ -149,8 +149,8 @@
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 );
};
--
To view, visit https://gerrit.wikimedia.org/r/275140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a5bac244a469e73643e8a7d978d9212dd838fb0
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
