Merge "Add ForeignUpload and ForeignStructuredUpload"

diff --combined maintenance/jsduck/categories.json
index ec2e51d,5b9f339..d142556
--- 1/maintenance/jsduck/categories.json
--- 2/maintenance/jsduck/categories.json
+++ b/maintenance/jsduck/categories.json
@@@ -31,8 -31,7 +31,8 @@@
                                        "mw.user",
                                        "mw.util",
                                        "mw.plugin.*",
 -                                      "mw.cookie"
 +                                      "mw.cookie",
 +                                      "mw.experiments"
                                ]
                        },
                        {
@@@ -61,7 -60,9 +61,9 @@@
                                "name": "Interfaces",
                                "classes": [
                                        "mw.Feedback*",
-                                       "mw.Upload*"
+                                       "mw.Upload*",
+                                       "mw.ForeignUpload",
+                                       "mw.ForeignStructuredUpload"
                                ]
                        },
                        {

diff --combined resources/Resources.php
index e21deb9,851dfa3..be06225
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -827,6 -827,7 +827,6 @@@ return array
                        'resources/lib/phpjs-sha1/sha1.js',
                        'resources/src/mediawiki/mediawiki.js',
                        'resources/src/mediawiki/mediawiki.errorLogger.js',
 -                      'resources/src/mediawiki/mediawiki.startUp.js',
                ),
                'debugScripts' => 'resources/src/mediawiki/mediawiki.log.js',
                'targets' => array( 'desktop', 'mobile' ),
@@@ -1126,6 -1127,20 +1126,20 @@@
                        'mediawiki.api.upload',
                ),
        ),
+       'mediawiki.ForeignUpload' => array(
+               'scripts' => 'resources/src/mediawiki/mediawiki.ForeignUpload.js',
+               'dependencies' => array(
+                       'mediawiki.ForeignApi',
+                       'mediawiki.Upload',
+                       'oojs',
+               ),
+       ),
+       'mediawiki.ForeignStructuredUpload' => array(
+               'scripts' => 'resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js',
+               'dependencies' => array(
+                       'mediawiki.ForeignUpload',
+               ),
+       ),
        'mediawiki.Upload.Dialog' => array(
                'scripts' => 'resources/src/mediawiki/mediawiki.Upload.Dialog.js',
                'dependencies' => array(
@@@ -1197,10 -1212,6 +1211,10 @@@
                'styles' => 'resources/src/mediawiki.toolbar/toolbar.less',
                'position' => 'top',
        ),
 +      'mediawiki.experiments' => array(
 +              'scripts' => 'resources/src/mediawiki/mediawiki.experiments.js',
 +              'targets' => array( 'desktop', 'mobile' ),
 +      ),
  
        /* MediaWiki Action */
  
@@@ -1433,18 -1444,9 +1447,18 @@@
        'mediawiki.page.gallery' => array(
                'scripts' => 'resources/src/mediawiki.page/mediawiki.page.gallery.js',
                'dependencies' => array(
 +                      'mediawiki.page.gallery.styles',
                        'jquery.throttle-debounce',
                )
        ),
 +      'mediawiki.page.gallery.styles' => array(
 +              'styles' => array(
 +                      'resources/src/mediawiki.page/mediawiki.page.gallery.print.css' => array( 'media' => 'print' ),
 +                      'resources/src/mediawiki.page/mediawiki.page.gallery.css',
 +              ),
 +              'position' => 'top',
 +              'targets' => array( 'desktop', 'mobile' ),
 +      ),
        'mediawiki.page.ready' => array(
                'scripts' => 'resources/src/mediawiki.page/mediawiki.page.ready.js',
                'dependencies' => array(
@@@ -1726,8 -1728,6 +1740,8 @@@
        'mediawiki.legacy.commonPrint' => array(
                'position' => 'top',
                'styles' => array(
 +                      // @todo: Remove mediawiki.page.gallery when cache has cleared
 +                      'resources/src/mediawiki.page/mediawiki.page.gallery.print.css' => array( 'media' => 'print' ),
                        'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' )
                ),
                'group' => 'print',
@@@ -1741,8 -1741,6 +1755,8 @@@
        'mediawiki.legacy.shared' => array(
                'position' => 'top',
                'styles' => array(
 +                      // @todo: Remove when mediawiki.page.gallery in cached html.
 +                      'resources/src/mediawiki.page/mediawiki.page.gallery.css',
                        'resources/src/mediawiki.legacy/shared.css' => array( 'media' => 'screen' )
                ),
        ),

diff --combined tests/qunit/QUnitTestResources.php
index f9ddcf2,ae2cc73..0a29af5
--- 1/tests/qunit/QUnitTestResources.php
--- 2/tests/qunit/QUnitTestResources.php
+++ b/tests/qunit/QUnitTestResources.php
@@@ -71,6 -71,8 +71,8 @@@ return array
                        'tests/qunit/suites/resources/mediawiki/mediawiki.storage.test.js',
                        'tests/qunit/suites/resources/mediawiki/mediawiki.template.test.js',
                        'tests/qunit/suites/resources/mediawiki/mediawiki.test.js',
+                       'tests/qunit/suites/resources/mediawiki/mediawiki.ForeignUpload.test.js',
+                       'tests/qunit/suites/resources/mediawiki/mediawiki.ForeignStructuredUpload.test.js',
                        'tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js',
                        'tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js',
                        'tests/qunit/suites/resources/mediawiki/mediawiki.track.test.js',
@@@ -88,7 -90,6 +90,7 @@@
                        'tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js',
                        'tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js',
                        'tests/qunit/suites/resources/mediawiki/mediawiki.cookie.test.js',
 +                      'tests/qunit/suites/resources/mediawiki/mediawiki.experiments.test.js',
                ),
                'dependencies' => array(
                        'jquery.accessKeyLabel',
@@@ -114,6 -115,8 +116,8 @@@
                        'mediawiki.api.upload',
                        'mediawiki.api.watch',
                        'mediawiki.ForeignApi.core',
+                       'mediawiki.ForeignUpload',
+                       'mediawiki.ForeignStructuredUpload',
                        'mediawiki.jqueryMsg',
                        'mediawiki.messagePoster',
                        'mediawiki.RegExp',
@@@ -128,7 -131,6 +132,7 @@@
                        'mediawiki.language',
                        'mediawiki.cldr',
                        'mediawiki.cookie',
 +                      'mediawiki.experiments',
                        'test.mediawiki.qunit.testrunner',
                ),
        )