jenkins-bot has submitted this change and it was merged.
Change subject: Make MWMediaDialog not crash on API errors
......................................................................
Make MWMediaDialog not crash on API errors
resp.query won't be set if resp.error is set instead.
Also rename alignButons to alignButtons.
Change-Id: Ie69fe1ddae393ee02b44e9288a35e0dd47d17e4e
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index 910adb4..f401f2e 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -188,7 +188,7 @@
*/
ve.ui.MWMediaDialog.prototype.initialize = function () {
var altTextFieldset, positionFieldset, borderField, positionField,
- alignLeftButton, alignCenterButton, alignRightButton,
alignButons;
+ alignLeftButton, alignCenterButton, alignRightButton,
alignButtons;
// Parent method
ve.ui.MWMediaDialog.super.prototype.initialize.call( this );
@@ -272,11 +272,11 @@
'label': ve.msg( 'visualeditor-dialog-media-position-right' )
} );
- alignButons = ( this.frame.getDir() === 'ltr' ) ?
+ alignButtons = ( this.frame.getDir() === 'ltr' ) ?
[ alignLeftButton, alignCenterButton, alignRightButton ] :
[ alignRightButton, alignCenterButton, alignLeftButton ];
- this.positionInput.addItems( alignButons, 0 );
+ this.positionInput.addItems( alignButtons, 0 );
this.positionCheckbox = new OO.ui.CheckboxInputWidget( {
'$': this.$
@@ -590,7 +590,7 @@
'meta': 'filerepoinfo'
} ).then(
function ( resp ) {
- return resp.query.repos || defaultSource;
+ return resp.query && resp.query.repos ||
defaultSource;
},
function () {
return $.Deferred().resolve( defaultSource );
--
To view, visit https://gerrit.wikimedia.org/r/154385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie69fe1ddae393ee02b44e9288a35e0dd47d17e4e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Mooeypoo <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
