Merge "Introduce mediawiki.router for handling hash fragment navigation"

diff --combined resources/Resources.php
index 4dce4b9,1200dfc..cf2abdb
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -735,6 -735,7 +735,6 @@@ return 
                'scripts' => [
                        'resources/lib/moment/moment.js',
                        'resources/src/moment-global.js',
 -                      'resources/src/moment-local-dmy.js',
                ],
                'languageScripts' => [
                        'af' => 'resources/lib/moment/locale/af.js',
@@@ -816,13 -817,6 +816,13 @@@
                        'zh-hans' => 'resources/lib/moment/locale/zh-cn.js',
                        'zh-hant' => 'resources/lib/moment/locale/zh-tw.js',
                ],
 +              // HACK: skinScripts come after languageScripts, and we need locale overrides to come
 +              // after locale definitions
 +              'skinScripts' => [
 +                      'default' => [
 +                              'resources/src/moment-locale-overrides.js',
 +                      ],
 +              ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
  
@@@ -1219,8 -1213,6 +1219,8 @@@
                        'upload-form-label-usage-filename',
                        'api-error-unknownerror',
                        'api-error-unknown-warning',
 +                      'api-error-autoblocked',
 +                      'api-error-blocked',
                        'api-error-badaccess-groups',
                        'api-error-badtoken',
                        'api-error-copyuploaddisabled',
@@@ -1288,18 -1280,18 +1288,18 @@@
                        'mediawiki.libs.jpegmeta',
                ],
                'messages' => [
 -                      'foreign-structured-upload-form-label-own-work',
 -                      'foreign-structured-upload-form-label-infoform-categories',
 -                      'foreign-structured-upload-form-label-infoform-date',
 -                      'foreign-structured-upload-form-label-own-work-message-default',
 -                      'foreign-structured-upload-form-label-not-own-work-message-default',
 -                      'foreign-structured-upload-form-label-not-own-work-local-default',
 -                      'foreign-structured-upload-form-label-own-work-message-shared',
 -                      'foreign-structured-upload-form-label-not-own-work-message-shared',
 -                      'foreign-structured-upload-form-label-not-own-work-local-shared',
 -                      'foreign-structured-upload-form-label-own-work-message-local',
 -                      'foreign-structured-upload-form-label-not-own-work-message-local',
 -                      'foreign-structured-upload-form-label-not-own-work-local-local',
 +                      'upload-form-label-own-work',
 +                      'upload-form-label-infoform-categories',
 +                      'upload-form-label-infoform-date',
 +                      'upload-form-label-own-work-message-default',
 +                      'upload-form-label-not-own-work-message-default',
 +                      'upload-form-label-not-own-work-local-default',
 +                      'upload-form-label-own-work-message-shared',
 +                      'upload-form-label-not-own-work-message-shared',
 +                      'upload-form-label-not-own-work-local-shared',
 +                      'upload-form-label-own-work-message-local',
 +                      'upload-form-label-not-own-work-message-local',
 +                      'upload-form-label-not-own-work-local-local',
                ],
        ],
        'mediawiki.toc' => [
@@@ -1877,7 -1869,6 +1877,7 @@@
                        'thumbnail.html' => 'resources/src/mediawiki.special/templates/thumbnail.html',
                ],
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.upload.js',
 +              'styles' => 'resources/src/mediawiki.special/mediawiki.special.upload.css',
                'messages' => [
                        'widthheight',
                        'size-bytes',
@@@ -2297,6 -2288,26 +2297,26 @@@
                ],
        ],
  
+       'mediawiki.router' => [
+               'scripts' => [
+                       'resources/src/mediawiki.router/index.js',
+               ],
+               'targets' => [ 'desktop', 'mobile' ],
+               'dependencies' => [
+                       'oojs-router',
+               ],
+       ],
+ 
+       'oojs-router' => [
+               'scripts' => [
+                       'resources/lib/oojs-router/oojs-router.js',
+               ],
+               'targets' => [ 'desktop', 'mobile' ],
+               'dependencies' => [
+                       'oojs',
+               ],
+       ],
+ 
        /* OOjs UI */
        // WARNING: OOjs-UI is NOT TESTED with older browsers and is likely to break
        // if loaded in browsers that don't support ES5