Yamelnychuk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/176937
Change subject: ResourceLoader: jquery.cookie changed to mediawiki.cookie
......................................................................
ResourceLoader: jquery.cookie changed to mediawiki.cookie
Change-Id: I4a9bad8de46f521ca1e63ca17a2fe27f1b9817d4
---
M resources/Resources.php
1 file changed, 11 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/37/176937/1
diff --git a/resources/Resources.php b/resources/Resources.php
index f2c3227..0581002 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -206,11 +206,17 @@
'styles' => 'resources/src/jquery/jquery.confirmable.css',
'dependencies' => 'mediawiki.jqueryMsg',
),
- // Use mediawiki.cookie in new code, rather than jquery.cookie.
'jquery.cookie' => array(
'scripts' => 'resources/lib/jquery/jquery.cookie.js',
'targets' => array( 'desktop', 'mobile' ),
),
+ 'mediawiki.cookie' => array(
+ 'scripts' => 'resources/src/mediawiki/mediawiki.cookie.js',
+ 'dependencies' => array(
+ 'jquery.cookie',
+ ),
+ 'targets' => array( 'desktop', 'mobile' ),
+ ),
'jquery.expandableField' => array(
'scripts' => 'resources/src/jquery/jquery.expandableField.js',
),
@@ -965,7 +971,7 @@
'mediawiki.toc' => array(
'scripts' => 'resources/src/mediawiki/mediawiki.toc.js',
'dependencies' => array(
- 'jquery.cookie',
+ 'mediawiki.cookie',
),
'messages' => array( 'showtoc', 'hidetoc' ),
'targets' => array( 'desktop', 'mobile' ),
@@ -978,7 +984,7 @@
'mediawiki.user' => array(
'scripts' => 'resources/src/mediawiki/mediawiki.user.js',
'dependencies' => array(
- 'jquery.cookie',
+ 'mediawiki.cookie',
'mediawiki.api',
'user.options',
'user.tokens',
@@ -1000,13 +1006,6 @@
'mediawiki.notify',
),
'position' => 'top', // For $wgPreloadJavaScriptMwUtil
- 'targets' => array( 'desktop', 'mobile' ),
- ),
- 'mediawiki.cookie' => array(
- 'scripts' => 'resources/src/mediawiki/mediawiki.cookie.js',
- 'dependencies' => array(
- 'jquery.cookie',
- ),
'targets' => array( 'desktop', 'mobile' ),
),
'mediawiki.toolbar' => array(
@@ -1037,7 +1036,7 @@
'styles' =>
'resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.css',
'dependencies' => array(
'jquery.makeCollapsible',
- 'jquery.cookie',
+ 'mediawiki.cookie',
'mediawiki.icon',
),
),
@@ -1306,7 +1305,7 @@
'scripts' =>
'resources/src/mediawiki.special/mediawiki.special.changeslist.legend.js',
'dependencies' => array(
'jquery.makeCollapsible',
- 'jquery.cookie',
+ 'mediawiki.cookie',
),
),
'mediawiki.special.changeslist.enhanced' => array(
--
To view, visit https://gerrit.wikimedia.org/r/176937
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a9bad8de46f521ca1e63ca17a2fe27f1b9817d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Yamelnychuk <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
