Merge "(bug 44219) Avoid fatal errors when a revision doesn't exist in action=info"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 9987ee1..c2df86d 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -20,6 +20,10 @@
  * @file
  */
 
+if( !defined( 'MEDIAWIKI' ) ) {
+       die( 'Not an entry point.' );
+}
+
 return array(
 
        /* Special modules who have their own classes */
@@ -145,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',
@@ -195,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',
@@ -654,6 +655,7 @@ return array(
        ),
        'mediawiki.searchSuggest' => array(
                'scripts' => 'resources/mediawiki/mediawiki.searchSuggest.js',
+               'styles' => 'resources/mediawiki/mediawiki.searchSuggest.css',
                'messages' => array(
                        'searchsuggest-search',
                        'searchsuggest-containing',
@@ -744,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',
@@ -762,7 +767,7 @@ return array(
                ),
                'dependencies' => array(
                                'mediawiki.language.data',
-                               'mediawiki.cldr'
+                               'mediawiki.cldr',
                        ),
                'targets' => array( 'desktop', 'mobile' ),
        ),
@@ -922,6 +927,9 @@ return array(
                ),
                'dependencies' => array( 'mediawiki.libs.jpegmeta', 'mediawiki.util' ),
        ),
+       'mediawiki.special.userlogin.signup' => array(
+               'scripts' => 'resources/mediawiki.special/mediawiki.special.userLogin.signup.js',
+       ),
        'mediawiki.special.javaScriptTest' => array(
                'scripts' => 'resources/mediawiki.special/mediawiki.special.javaScriptTest.js',
                'messages' => array_merge( Skin::getSkinNameMessages(), array(