Merge "Make mediawiki.action.view.dblClickEdit recheck preference"

diff --combined resources/Resources.php
index b9b2c8d,42c5b26..3bb5b4e
--- 1/resources/Resources.php
--- 2/resources/Resources.php
+++ b/resources/Resources.php
@@@ -200,7 -200,6 +200,7 @@@ return array
                        'confirmable-confirm',
                        'confirmable-yes',
                        'confirmable-no',
 +                      'word-separator',
                ),
                'styles' => 'resources/src/jquery/jquery.confirmable.css',
                'dependencies' => 'mediawiki.jqueryMsg',
@@@ -985,10 -984,8 +985,10 @@@
  
        'mediawiki.action.edit' => array(
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.js',
 +              'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.css',
                'dependencies' => array(
                        'mediawiki.action.edit.styles',
 +                      'mediawiki.action.edit.toolbar',
                        'jquery.textSelection',
                        'jquery.byteLimit',
                ),
@@@ -998,10 -995,6 +998,10 @@@
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.styles.css',
                'position' => 'top',
        ),
 +      'mediawiki.action.edit.toolbar' => array(
 +              'class' => 'ResourceLoaderEditToolbarModule',
 +              'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.toolbar/mediawiki.action.edit.toolbar.less',
 +      ),
        'mediawiki.action.edit.collapsibleFooter' => array(
                'scripts' => 'resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js',
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.css',
@@@ -1034,6 -1027,7 +1034,7 @@@
                'dependencies' => array(
                        'mediawiki.util',
                        'mediawiki.page.startup',
+                       'user.options',
                ),
        ),
        'mediawiki.action.view.metadata' => array(
@@@ -1176,11 -1170,11 +1177,11 @@@
        'mediawiki.page.ready' => array(
                'scripts' => 'resources/src/mediawiki.page/mediawiki.page.ready.js',
                'dependencies' => array(
 +                      'jquery.accessKeyLabel',
                        'jquery.checkboxShiftClick',
                        'jquery.makeCollapsible',
                        'jquery.placeholder',
                        'jquery.mw-jump',
 -                      'mediawiki.util',
                ),
                'targets' => array( 'desktop', 'mobile' ),
        ),
@@@ -1297,8 -1291,6 +1298,8 @@@
                'position' => 'top',
                'messages' => array(
                        'prefs-tabs-navigation-hint',
 +                      'prefswarning-warning',
 +                      'saveprefs',
                ),
                'dependencies' => array(
                        'mediawiki.language',
@@@ -1322,6 -1314,7 +1323,6 @@@
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.undelete.js',
        ),
        'mediawiki.special.upload' => array(
 -              // @todo merge in remainder of mediawiki.legacy.upload
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.upload.js',
                'messages' => array(
                        'widthheight',
@@@ -1332,10 -1325,7 +1333,10 @@@
                        'largefileserver',
                ),
                'dependencies' => array(
 +                      'jquery.spinner',
 +                      'mediawiki.api',
                        'mediawiki.libs.jpegmeta',
 +                      'mediawiki.Title',
                        'mediawiki.util',
                ),
        ),
@@@ -1434,26 -1424,29 +1435,26 @@@
                'position' => 'top',
        ),
        'mediawiki.legacy.commonPrint' => array(
 -              'styles' => array( 'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' ) ),
 +              'styles' => array(
 +                      'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' )
 +              ),
        ),
        'mediawiki.legacy.protect' => array(
                'scripts' => 'resources/src/mediawiki.legacy/protect.js',
                'dependencies' => array(
                        'jquery.byteLimit',
                ),
 -              'position' => 'top',
 +              'messages' => array( 'protect-unchain-permissions' )
        ),
        'mediawiki.legacy.shared' => array(
                // Used in the web installer. Test it after modifying this definition!
 -              'styles' => array( 'resources/src/mediawiki.legacy/shared.css' => array( 'media' => 'screen' ) ),
 +              'styles' => array(
 +                      'resources/src/mediawiki.legacy/shared.css' => array( 'media' => 'screen' )
 +              ),
        ),
        'mediawiki.legacy.oldshared' => array(
 -              'styles' => array( 'resources/src/mediawiki.legacy/oldshared.css' => array( 'media' => 'screen' ) ),
 -      ),
 -      'mediawiki.legacy.upload' => array(
 -              'scripts' => 'resources/src/mediawiki.legacy/upload.js',
 -              'dependencies' => array(
 -                      'jquery.spinner',
 -                      'mediawiki.api',
 -                      'mediawiki.Title',
 -                      'mediawiki.util',
 +              'styles' => array(
 +                      'resources/src/mediawiki.legacy/oldshared.css' => array( 'media' => 'screen' )
                ),
        ),
        'mediawiki.legacy.wikibits' => array(
@@@ -1467,55 -1460,38 +1468,55 @@@
        /* MediaWiki UI */
  
        'mediawiki.ui' => array(
 -              'styles' => array(
 -                      'resources/src/mediawiki.ui/default.less',
 +              'skinStyles' => array(
 +                      'default' => array(
 +                              'resources/src/mediawiki.ui/default.less',
 +                      ),
                ),
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.ui.checkbox' => array(
 -              'styles' => array(
 -                      'resources/src/mediawiki.ui/components/checkbox.less',
 +              'skinStyles' => array(
 +                      'default' => array(
 +                              'resources/src/mediawiki.ui/components/checkbox.less',
 +                      ),
                ),
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        // Lightweight module for anchor styles
        'mediawiki.ui.anchor' => array(
 -              'styles' => array(
 -                      'resources/src/mediawiki.ui/components/anchors.less',
 +              'skinStyles' => array(
 +                      'default' => array(
 +                              'resources/src/mediawiki.ui/components/anchors.less',
 +                      ),
                ),
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        // Lightweight module for button styles
        'mediawiki.ui.button' => array(
 -              'styles' => array(
 -                      'resources/src/mediawiki.ui/components/buttons.less',
 +              'skinStyles' => array(
 +                      'default' => array(
 +                              'resources/src/mediawiki.ui/components/buttons.less',
 +                      ),
                ),
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.ui.input' => array(
 +              'skinStyles' => array(
 +                      'default' => array(
 +                              'resources/src/mediawiki.ui/components/inputs.less',
 +                      ),
 +              ),
 +              'position' => 'top',
 +              'targets' => array( 'desktop', 'mobile' ),
 +      ),
 +      'mediawiki.ui.icon' => array(
                'styles' => array(
 -                      'resources/src/mediawiki.ui/components/inputs.less',
 +                      'resources/src/mediawiki.ui/components/icons.less',
                ),
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),