Merge "mw.ForeignApi: don’t set origin for same-origin requests"

diff --combined resources/Resources.php
index fb95b80,a9e29c9..180ed65
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -175,10 -175,11 +175,10 @@@ return 
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'jquery.color' => [
 -              'scripts' => 'resources/src/jquery/jquery.color.js',
 -              'dependencies' => 'jquery.colorUtil',
 -      ],
 -      'jquery.colorUtil' => [
 -              'scripts' => 'resources/src/jquery/jquery.colorUtil.js',
 +              'scripts' => [
 +                      'resources/src/jquery.color/jquery.colorUtil.js',
 +                      'resources/src/jquery.color/jquery.color.js',
 +              ],
        ],
        'jquery.confirmable' => [
                'scripts' => [
@@@ -894,6 -895,7 +894,7 @@@
                'dependencies' => [
                        'mediawiki.api',
                        'oojs',
+                       'mediawiki.Uri',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@@ -939,9 -941,6 +940,9 @@@
                'scripts' => [
                        'resources/src/mediawiki.htmlform.checker.js',
                ],
 +              'dependencies' => [
 +                      'mediawiki.util',
 +              ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.htmlform.ooui' => [
@@@ -1254,8 -1253,8 +1255,8 @@@
                ]
        ],
        'mediawiki.util' => [
 -              'localBasePath' => "$IP/resources/src/mediawiki.util/",
 -              'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.util/",
 +              'localBasePath' => "$IP/resources/src/mediawiki.util",
 +              'remoteBasePath' => "$wgResourceBasePath/resources/src/mediawiki.util",
                'packageFiles' => [
                        'util.js',
                        'jquery.accessKeyLabel.js',
@@@ -2315,6 -2314,7 +2316,6 @@@
                'dependencies' => [
                        'mediawiki.api',
                        'mediawiki.jqueryMsg',
 -                      'jquery.throttle-debounce',
                        'mediawiki.htmlform.checker',
                ],
        ],