Merge "Avoid muliple cache calls to explicitly defined tags"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index 43a75a2..7c2a9df 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -59,9 +59,6 @@ return array(
        // Scripts for the dynamic language specific data, like grammar forms.
        'mediawiki.language.data' => array( 'class' => 'ResourceLoaderLanguageDataModule' ),
 
-       // Dynamic data for mediawiki.jqueryMsg, such as allowed tags
-       'mediawiki.jqueryMsg.data' => array( 'class' => 'ResourceLoaderJqueryMsgDataModule' ),
-
        /* MediaWiki base skinning modules */
 
        /**
@@ -1126,7 +1123,7 @@ return array(
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.css',
                'dependencies' => array(
                        'jquery.makeCollapsible',
-                       'jquery.cookie',
+                       'mediawiki.cookie',
                        'mediawiki.icon',
                ),
        ),
@@ -1296,9 +1293,10 @@ return array(
        ),
 
        'mediawiki.jqueryMsg' => array(
+               // Add data for mediawiki.jqueryMsg, such as allowed tags
+               'class' => 'ResourceLoaderJqueryMsgModule',
                'scripts' => 'resources/src/mediawiki/mediawiki.jqueryMsg.js',
                'dependencies' => array(
-                       'mediawiki.jqueryMsg.data',
                        'mediawiki.util',
                        'mediawiki.language',
                        'dom-level2-shim',
@@ -1432,7 +1430,7 @@ return array(
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.legend.js',
                'dependencies' => array(
                        'jquery.makeCollapsible',
-                       'jquery.cookie',
+                       'mediawiki.cookie',
                ),
        ),
        'mediawiki.special.changeslist.enhanced' => array(
@@ -1736,6 +1734,8 @@ return array(
                        'default' => 'resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.css',
                ),
                'dependencies' => array(
+                       'mediawiki.Title',
+                       'mediawiki.api',
                        'oojs-ui',
                ),
                'messages' => array(