Merge "Implement mediawiki.confirmCloseWindow module"

diff --combined resources/Resources.php
index 8e026c7,a82260c..783ba9a
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -93,7 -93,6 +93,7 @@@ return array
                ),
        ),
        'mediawiki.skinning.interface' => array(
 +              'class' => 'ResourceLoaderSkinModule',
                // Used in the web installer. Test it after modifying this definition!
                'styles' => array(
                        'resources/src/mediawiki.skinning/elements.css' => array( 'media' => 'screen' ),
@@@ -201,7 -200,6 +201,7 @@@
                        'confirmable-confirm',
                        'confirmable-yes',
                        'confirmable-no',
 +                      'word-separator',
                ),
                'styles' => 'resources/src/jquery/jquery.confirmable.css',
                'dependencies' => 'mediawiki.jqueryMsg',
@@@ -820,6 -818,11 +820,11 @@@
        'mediawiki.content.json' => array(
                'styles' => 'resources/src/mediawiki/mediawiki.content.json.css',
        ),
+       'mediawiki.confirmCloseWindow' => array(
+               'scripts' => array(
+                       'resources/src/mediawiki/mediawiki.confirmCloseWindow.js',
+               ),
+       ),
        'mediawiki.debug' => array(
                'scripts' => array(
                        'resources/src/mediawiki/mediawiki.debug.js',
@@@ -1035,7 -1038,6 +1040,7 @@@
                'dependencies' => array(
                        'mediawiki.util',
                        'mediawiki.page.startup',
 +                      'user.options',
                ),
        ),
        'mediawiki.action.view.metadata' => array(
@@@ -1066,6 -1068,11 +1071,6 @@@
                ),
                'position' => 'top',
        ),
 -      // Deployment hack for compatibility with cached HTML, remove before 1.24 release
 -      'mediawiki.action.view.redirectToFragment' => array(
 -              'dependencies' => 'mediawiki.action.view.redirect',
 -              'position' => 'top',
 -      ),
        'mediawiki.action.view.redirectPage' => array(
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.view.redirectPage.css',
                'position' => 'top',
@@@ -1077,7 -1084,8 +1082,8 @@@
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.editWarning.js',
                'dependencies' => array(
                        'jquery.textSelection',
-                       'mediawiki.jqueryMsg'
+                       'mediawiki.jqueryMsg',
+                       'mediawiki.confirmCloseWindow',
                ),
                'messages' => array(
                        'editwarning-warning',
@@@ -1294,12 -1302,14 +1300,12 @@@
                'position' => 'top',
                'messages' => array(
                        'prefs-tabs-navigation-hint',
 +                      'prefswarning-warning',
 +                      'saveprefs',
                ),
                'dependencies' => array(
                        'mediawiki.language',
                ),
 -              'messages' => array(
 -                      'prefswarning-warning',
 -                      'saveprefs',
 -              ),
        ),
        'mediawiki.special.recentchanges' => array(
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.recentchanges.js',
@@@ -1510,13 -1520,6 +1516,13 @@@
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
        ),
 +      'mediawiki.ui.icon' => array(
 +              'styles' => array(
 +                      'resources/src/mediawiki.ui/components/icons.less',
 +              ),
 +              'position' => 'top',
 +              'targets' => array( 'desktop', 'mobile' ),
 +      ),
  
        /* es5-shim */
        'es5-shim' => array(