Merge "Add "unsaved changes" warning to Special:Preferences"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 19 Sep 2014 01:19:52 +0000 (01:19 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 19 Sep 2014 01:19:52 +0000 (01:19 +0000)
1  2 
resources/Resources.php

diff --combined resources/Resources.php
@@@ -1175,11 -1175,11 +1175,11 @@@ return array
        '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' ),
        ),
                'dependencies' => array(
                        'mediawiki.language',
                ),
+               'messages' => array(
+                       'prefswarning-warning',
+                       'saveprefs',
+               ),
        ),
        'mediawiki.special.recentchanges' => array(
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.recentchanges.js',
        /* 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(
 -              'styles' => array(
 -                      'resources/src/mediawiki.ui/components/inputs.less',
 +              'skinStyles' => array(
 +                      'default' => array(
 +                              'resources/src/mediawiki.ui/components/inputs.less',
 +                      ),
                ),
                'position' => 'top',
                'targets' => array( 'desktop', 'mobile' ),