Robmoen has uploaded a new change for review. https://gerrit.wikimedia.org/r/93915
Change subject: WIP: Target mobile on ve dependencies ...................................................................... WIP: Target mobile on ve dependencies Change-Id: I708006fd6733cac89128bc76a1cd34c0d091c371 --- M includes/resourceloader/ResourceLoaderUserGroupsModule.php M includes/resourceloader/ResourceLoaderUserModule.php M includes/resourceloader/ResourceLoaderUserOptionsModule.php M includes/resourceloader/ResourceLoaderUserTokensModule.php M resources/Resources.php 5 files changed, 22 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/15/93915/1 diff --git a/includes/resourceloader/ResourceLoaderUserGroupsModule.php b/includes/resourceloader/ResourceLoaderUserGroupsModule.php index 9064263..9004267 100644 --- a/includes/resourceloader/ResourceLoaderUserGroupsModule.php +++ b/includes/resourceloader/ResourceLoaderUserGroupsModule.php @@ -25,8 +25,12 @@ */ class ResourceLoaderUserGroupsModule extends ResourceLoaderWikiModule { - /* Protected Methods */ + /* Protected Members */ + protected $origin = self::ORIGIN_USER_SITEWIDE; + protected $targets = array( 'desktop', 'mobile' ); + + /* Protected Methods */ /** * @param $context ResourceLoaderContext diff --git a/includes/resourceloader/ResourceLoaderUserModule.php b/includes/resourceloader/ResourceLoaderUserModule.php index 7a04e47..7454b65 100644 --- a/includes/resourceloader/ResourceLoaderUserModule.php +++ b/includes/resourceloader/ResourceLoaderUserModule.php @@ -27,9 +27,12 @@ */ class ResourceLoaderUserModule extends ResourceLoaderWikiModule { - /* Protected Methods */ + /* Protected Members */ + protected $origin = self::ORIGIN_USER_INDIVIDUAL; + /* Protected Methods */ + /** * @param $context ResourceLoaderContext * @return array diff --git a/includes/resourceloader/ResourceLoaderUserOptionsModule.php b/includes/resourceloader/ResourceLoaderUserOptionsModule.php index 0b7e196..1df8c56 100644 --- a/includes/resourceloader/ResourceLoaderUserOptionsModule.php +++ b/includes/resourceloader/ResourceLoaderUserOptionsModule.php @@ -33,6 +33,8 @@ protected $origin = self::ORIGIN_CORE_INDIVIDUAL; + protected $targets = array( 'desktop', 'mobile' ); + /* Methods */ /** diff --git a/includes/resourceloader/ResourceLoaderUserTokensModule.php b/includes/resourceloader/ResourceLoaderUserTokensModule.php index 92ebbe9..cdc9611 100644 --- a/includes/resourceloader/ResourceLoaderUserTokensModule.php +++ b/includes/resourceloader/ResourceLoaderUserTokensModule.php @@ -30,6 +30,8 @@ protected $origin = self::ORIGIN_CORE_INDIVIDUAL; + protected $targets = array( 'desktop', 'mobile' ); + /* Methods */ /** diff --git a/resources/Resources.php b/resources/Resources.php index 463dec8..98033d3 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -158,6 +158,7 @@ 'jquery.autoEllipsis' => array( 'scripts' => 'resources/jquery/jquery.autoEllipsis.js', 'dependencies' => 'jquery.highlightText', + 'targets' => array( 'desktop', 'mobile' ), ), 'jquery.badge' => array( 'scripts' => 'resources/jquery/jquery.badge.js', @@ -171,6 +172,7 @@ 'jquery.byteLimit' => array( 'scripts' => 'resources/jquery/jquery.byteLimit.js', 'dependencies' => 'jquery.byteLength', + 'targets' => array( 'desktop', 'mobile' ), ), 'jquery.checkboxShiftClick' => array( 'scripts' => 'resources/jquery/jquery.checkboxShiftClick.js', @@ -225,6 +227,7 @@ 'jquery.highlightText' => array( 'scripts' => 'resources/jquery/jquery.highlightText.js', 'dependencies' => 'jquery.mwExtension', + 'targets' => array( 'desktop', 'mobile' ), ), 'jquery.hoverIntent' => array( 'scripts' => 'resources/jquery/jquery.hoverIntent.js', @@ -605,6 +608,7 @@ 'mediawiki.api' => array( 'scripts' => 'resources/mediawiki.api/mediawiki.api.js', 'dependencies' => 'mediawiki.util', + 'targets' => array( 'desktop', 'mobile' ), ), 'mediawiki.api.category' => array( 'scripts' => 'resources/mediawiki.api/mediawiki.api.category.js', @@ -703,6 +707,7 @@ 'dependencies' => array( 'mediawiki.page.startup', ), + 'targets' => array( 'desktop', 'mobile' ), ), 'mediawiki.notify' => array( 'scripts' => 'resources/mediawiki/mediawiki.notify.js', @@ -729,9 +734,11 @@ 'jquery.byteLength', 'mediawiki.util', ), + 'targets' => array( 'desktop', 'mobile' ), ), 'mediawiki.Uri' => array( 'scripts' => 'resources/mediawiki/mediawiki.Uri.js', + 'targets' => array( 'desktop', 'mobile' ), ), 'mediawiki.user' => array( 'scripts' => 'resources/mediawiki/mediawiki.user.js', @@ -741,6 +748,7 @@ 'user.options', 'user.tokens', ), + 'targets' => array( 'desktop', 'mobile' ), ), 'mediawiki.util' => array( 'scripts' => 'resources/mediawiki/mediawiki.util.js', @@ -793,6 +801,7 @@ 'mediawiki.action.history.diff' => array( 'styles' => 'resources/mediawiki.action/mediawiki.action.history.diff.css', 'group' => 'mediawiki.action.history', + 'targets' => array( 'desktop', 'mobile' ), ), 'mediawiki.action.view.dblClickEdit' => array( 'scripts' => 'resources/mediawiki.action/mediawiki.action.view.dblClickEdit.js', -- To view, visit https://gerrit.wikimedia.org/r/93915 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I708006fd6733cac89128bc76a1cd34c0d091c371 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Robmoen <rm...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits