Mhutti1 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/260740
Change subject: Moved uw.controller.Details.prototype.valid to use
OO.ui.confirm()
......................................................................
Moved uw.controller.Details.prototype.valid to use OO.ui.confirm()
Changed the popup box to use OO.ui.confirm and as this always resolves
added a check to make sure it returns true.
Bug: T117077
Change-Id: I00a9407c95ecacfba40852ab7b4427f944f45684
---
M resources/controller/uw.controller.Details.js
1 file changed, 10 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/40/260740/1
diff --git a/resources/controller/uw.controller.Details.js
b/resources/controller/uw.controller.Details.js
index ddbdec3..e3f9233 100644
--- a/resources/controller/uw.controller.Details.js
+++ b/resources/controller/uw.controller.Details.js
@@ -90,13 +90,15 @@
uw.controller.Details.prototype.startDetails = function () {
var details = this;
- this.valid().done( function () {
- details.ui.hideEndButtons();
- details.submit();
- details.emit( 'start-details' );
- } ).fail( function () {
- details.emit( 'details-error' );
- } );
+ this.valid().done( function ( valid ) {
+ if ( valid ) {
+ details.ui.hideEndButtons();
+ details.submit();
+ details.emit( 'start-details' );
+ } else {
+ details.emit( 'details-error' );
+ }
+ }
};
/**
@@ -173,15 +175,8 @@
};
uw.controller.Details.prototype.confirmationDialog = function () {
- var
- windowManager = new OO.ui.WindowManager(),
- confirmationDialog = new OO.ui.MessageDialog();
- windowManager.addWindows( [ confirmationDialog ] );
- $( 'body' ).append( windowManager.$element );
-
- return windowManager.openWindow( confirmationDialog, {
+ return OO.ui.confirm( mw.message( 'mwe-upwiz-dialog-warning'
).text(), {
title: mw.message( 'mwe-upwiz-dialog-title' ).text(),
- message: mw.message( 'mwe-upwiz-dialog-warning'
).text(),
verbose: true,
actions: [
{
@@ -196,16 +191,6 @@
flags: [ 'constructive', 'primary' ]
}
]
- } ).then( function ( opened ) {
- return opened.then( function ( closing ) {
- return closing.then( function ( data ) {
- if ( data.action === 'accept' ) {
- return $.Deferred().resolve();
- }
-
- return $.Deferred().reject();
- } );
- } );
} );
};
--
To view, visit https://gerrit.wikimedia.org/r/260740
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I00a9407c95ecacfba40852ab7b4427f944f45684
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Mhutti1 <mhut...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
