Merge "mediawiki.action.edit.preview: Assorted fixes"
authorTheDJ <hartman.wiki@gmail.com>
Sun, 25 Aug 2013 18:35:08 +0000 (18:35 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 25 Aug 2013 18:35:08 +0000 (18:35 +0000)
1  2 
resources/Resources.php

diff --combined resources/Resources.php
@@@ -719,17 -719,12 +719,17 @@@ return array
        'mediawiki.action.edit' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.js',
                'dependencies' => array(
 +                      'mediawiki.action.edit.styles',
                        'mediawiki.legacy.wikibits',
                        'jquery.textSelection',
                        'jquery.byteLimit',
                ),
                'position' => 'top',
        ),
 +      'mediawiki.action.edit.styles' => array(
 +              'styles' => 'resources/mediawiki.action/mediawiki.action.edit.styles.css',
 +              'position' => 'top',
 +      ),
        'mediawiki.action.edit.collapsibleFooter' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js',
                'styles' => 'resources/mediawiki.action/mediawiki.action.edit.collapsibleFooter.css',
                'dependencies' => array(
                        'jquery.form',
                        'jquery.spinner',
+                       'mediawiki.action.history.diff',
                ),
        ),
        'mediawiki.action.history' => array(
                'targets' => array( 'desktop', 'mobile' ),
        ),
  
 +      'mediawiki.language.months' => array(
 +              'scripts' => 'resources/mediawiki.language/mediawiki.language.months.js',
 +              'dependencies' => 'mediawiki.language',
 +              'messages' => array_merge(
 +                      Language::$mMonthMsgs,
 +                      Language::$mMonthGenMsgs,
 +                      Language::$mMonthAbbrevMsgs
 +              )
 +      ),
 +
        /* MediaWiki Libs */
  
        'mediawiki.libs.jpegmeta' => array(
  
        /* MediaWiki Page */
  
 +      'mediawiki.page.gallery' => array(
 +              'scripts' => 'resources/mediawiki.page/mediawiki.page.gallery.js',
 +      ),
        'mediawiki.page.ready' => array(
                'scripts' => 'resources/mediawiki.page/mediawiki.page.ready.js',
                'dependencies' => array(
                        'watcherrortext',
                ),
        ),
 +      'mediawiki.page.image.pagination' => array(
 +              'scripts' => 'resources/mediawiki.page/mediawiki.page.image.pagination.js',
 +              'dependencies' => array( 'jquery.spinner' )
 +      ),
  
        /* MediaWiki Special pages */
  
                'remoteBasePath' => $GLOBALS['wgStylePath'],
                'localBasePath' => $GLOBALS['wgStyleDirectory'],
                'dependencies' => array(
 +                      'mediawiki.api',
 +                      'mediawiki.Title',
                        'mediawiki.legacy.wikibits',
                        'mediawiki.util',
                ),