Merge "rdbms: make selectRowCount() use $var argument to exclude NULLs"

[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 3873e9b..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,6 +56,12 @@
 
        /* Static Properties */
 
+       /**
+        * @inheritdoc
+        * @property name
+        */
+       mw.Upload.Dialog.static.name = 'mwUploadDialog';
+
        /**
         * @inheritdoc
         * @property title
@@ -200,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() );