Merge "Put the check for empty comment outside of the section anchor section of EditP...

[lhc/web/wiklou.git] / resources / Resources.php

diff --git a/resources/Resources.php b/resources/Resources.php
index 672f457..c2df86d 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -149,10 +149,6 @@ return array(
                'scripts' => 'resources/jquery/jquery.client.js',
                'targets' => array( 'desktop', 'mobile' ),
        ),
-       'jquery.collapsibleTabs' => array(
-               'scripts' => 'resources/jquery/jquery.collapsibleTabs.js',
-               'dependencies' => 'jquery.delayedBind',
-       ),
        'jquery.color' => array(
                'scripts' => 'resources/jquery/jquery.color.js',
                'dependencies' => 'jquery.colorUtil',
@@ -199,6 +195,7 @@ return array(
        ),
        'jquery.json' => array(
                'scripts' => 'resources/jquery/jquery.json.js',
+               'targets' => array( 'mobile', 'desktop' ),
        ),
        'jquery.localize' => array(
                'scripts' => 'resources/jquery/jquery.localize.js',
@@ -749,7 +746,10 @@ return array(
        /* MediaWiki Language */
 
        'mediawiki.language' => array(
-               'scripts' => 'resources/mediawiki.language/mediawiki.language.js',
+               'scripts' => array(
+                       'resources/mediawiki.language/mediawiki.language.js',
+                       'resources/mediawiki.language/mediawiki.language.numbers.js'
+               ),
                'languageScripts' => array(
                        'bs' => 'resources/mediawiki.language/languages/bs.js',
                        'dsb' => 'resources/mediawiki.language/languages/dsb.js',
@@ -767,7 +767,7 @@ return array(
                ),
                'dependencies' => array(
                                'mediawiki.language.data',
-                               'mediawiki.cldr'
+                               'mediawiki.cldr',
                        ),
                'targets' => array( 'desktop', 'mobile' ),
        ),