Merge "Use new API for descriptions in TitleWidget"

[lhc/web/wiklou.git] / resources / src / mediawiki / mediawiki.Upload.Dialog.js

diff --git a/resources/src/mediawiki/mediawiki.Upload.Dialog.js b/resources/src/mediawiki/mediawiki.Upload.Dialog.js
index a719ffe..00c04bc 100644 (file)
--- a/resources/src/mediawiki/mediawiki.Upload.Dialog.js
+++ b/resources/src/mediawiki/mediawiki.Upload.Dialog.js
@@ -29,6 +29,9 @@
         * @uses mw.Upload
         * @uses mw.Upload.BookletLayout
         * @extends OO.ui.ProcessDialog
+        *
+        * @constructor
+        * @param {Object} [config] Configuration options
         * @cfg {Function} [bookletClass=mw.Upload.BookletLayout] Booklet class to be
         *     used for the steps
         * @cfg {Object} [booklet] Booklet constructor configuration
@@ -53,11 +56,16 @@
 
        /* Static Properties */
 
+       /**
+        * @inheritdoc
+        * @property name
+        */
+       mw.Upload.Dialog.static.name = 'mwUploadDialog';
+
        /**
         * @inheritdoc
         * @property title
         */
-       /*jshint -W024*/
        mw.Upload.Dialog.static.title = mw.msg( 'upload-dialog-title' );
 
        /**
@@ -97,8 +105,6 @@
                }
        ];
 
-       /*jshint +W024*/
-
        /* Methods */
 
        /**
@@ -125,6 +131,7 @@
         * @return {mw.Upload.BookletLayout} An upload booklet
         */
        mw.Upload.Dialog.prototype.createUploadBooklet = function () {
+               // eslint-disable-next-line new-cap
                return new this.bookletClass( $.extend( {
                        $overlay: this.$overlay
                }, this.bookletConfig ) );
@@ -202,7 +209,7 @@
                        } );
                }
                if ( action === 'cancel' ) {
-                       return new OO.ui.Process( this.close() );
+                       return new OO.ui.Process( this.close().closed );
                }
                if ( action === 'cancelupload' ) {
                        return new OO.ui.Process( this.uploadBooklet.initialize() );