Add mobile target to modules needed for mw.msg()

This changes allows us to use mw.msg() in MobileFrontend.

Change-Id: I446656bcc17a31d23da054a6e1154f3e5823fbf5

diff --git a/includes/resourceloader/ResourceLoaderLanguageDataModule.php b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
index c916c4a..9679a59 100644 (file)
--- a/includes/resourceloader/ResourceLoaderLanguageDataModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
@@ -28,6 +28,7 @@
 class ResourceLoaderLanguageDataModule extends ResourceLoaderModule {
 
        protected $language;
+       protected $targets = array( 'desktop', 'mobile' );
        /**
         * Get the grammar forms for the site content language.
         *

diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php
index b3e1f93..e4ae0a2 100644 (file)
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -58,6 +58,7 @@ abstract class ResourceLoaderModule {
        /* Protected Members */
 
        protected $name = null;
+       protected $targets = array( 'desktop' );
 
        // In-object cache for file dependencies
        protected $fileDeps = array();
@@ -291,12 +292,11 @@ abstract class ResourceLoaderModule {
 
        /**
         * Get target(s) for the module, eg ['desktop'] or ['desktop', 'mobile']
-        * Default implementation hardcodes 'desktop'.
         *
         * @return array of strings
         */
        public function getTargets() {
-               return array( 'desktop' );
+               return $this->targets;
        }
 
        /**

diff --git a/resources/Resources.php b/resources/Resources.php
index 80b9a76..9987ee1 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -143,6 +143,7 @@ return array(
        ),
        'jquery.client' => array(
                'scripts' => 'resources/jquery/jquery.client.js',
+               'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.collapsibleTabs' => array(
                'scripts' => 'resources/jquery/jquery.collapsibleTabs.js',
@@ -157,6 +158,7 @@ return array(
        ),
        'jquery.cookie' => array(
                'scripts' => 'resources/jquery/jquery.cookie.js',
+               'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.delayedBind' => array(
                'scripts' => 'resources/jquery/jquery.delayedBind.js',
@@ -210,6 +212,7 @@ return array(
        ),
        'jquery.mwExtension' => array(
                'scripts' => 'resources/jquery/jquery.mwExtension.js',
+               'targets' => array( 'desktop', 'mobile' ),
        ),
        'jquery.placeholder' => array(
                'scripts' => 'resources/jquery/jquery.placeholder.js',
@@ -647,6 +650,7 @@ return array(
        ),
        'mediawiki.notify' => array(
                'scripts' => 'resources/mediawiki/mediawiki.notify.js',
+               'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.searchSuggest' => array(
                'scripts' => 'resources/mediawiki/mediawiki.searchSuggest.js',
@@ -687,6 +691,7 @@ return array(
                ),
                'messages' => array( 'showtoc', 'hidetoc' ),
                'position' => 'top', // For $wgPreloadJavaScriptMwUtil
+               'targets' => array( 'desktop', 'mobile' ),
        ),
 
        /* MediaWiki Action */
@@ -759,6 +764,7 @@ return array(
                                'mediawiki.language.data',
                                'mediawiki.cldr'
                        ),
+               'targets' => array( 'desktop', 'mobile' ),
        ),
 
        'mediawiki.cldr' => array(
@@ -766,14 +772,17 @@ return array(
                'dependencies' => array(
                        'mediawiki.libs.pluralruleparser',
                ),
+               'targets' => array( 'desktop', 'mobile' ),
        ),
 
        'mediawiki.libs.pluralruleparser' => array(
                'scripts' => 'resources/mediawiki.libs/CLDRPluralRuleParser.js',
+               'targets' => array( 'desktop', 'mobile' ),
        ),
 
        'mediawiki.language.init' => array(
                'scripts' => 'resources/mediawiki.language/mediawiki.language.init.js',
+               'targets' => array( 'desktop', 'mobile' ),
        ),
 
        'mediawiki.jqueryMsg' => array(
@@ -782,6 +791,7 @@ return array(
                        'mediawiki.util',
                        'mediawiki.language',
                ),
+               'targets' => array( 'desktop', 'mobile' ),
        ),
 
        /* MediaWiki Libs */