jenkins-bot has submitted this change and it was merged.

Change subject: Move contents of resources/jquery/ to Repo
......................................................................


Move contents of resources/jquery/ to Repo

$.removeClassByRegex, $.sticknode are used only by jquery.wikibase widgets
due to be moved to Repo.

Change-Id: I6b0865ace791d9b3991f83c724f2d7caa3592282
---
M lib/resources/Resources.php
M lib/tests/qunit/resources.php
M repo/resources/Resources.php
R repo/resources/jquery/jquery.removeClassByRegex.js
R repo/resources/jquery/jquery.sticknode.js
R repo/resources/jquery/jquery.util.EventSingletonManager.js
R repo/tests/qunit/jquery/jquery.removeClassByRegex.tests.js
R repo/tests/qunit/jquery/jquery.sticknode.tests.js
R repo/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
M repo/tests/qunit/resources.php
10 files changed, 51 insertions(+), 51 deletions(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index deb74bd..d183f6c 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -102,30 +102,6 @@
                        ),
                ),
 
-               'jquery.removeClassByRegex' => $moduleTemplate + array(
-                       'scripts' => array(
-                               'jquery/jquery.removeClassByRegex.js',
-                       ),
-               ),
-
-               'jquery.sticknode' => $moduleTemplate + array(
-                       'scripts' => array(
-                               'jquery/jquery.sticknode.js',
-                       ),
-                       'dependencies' => array(
-                               'jquery.util.EventSingletonManager',
-                       ),
-               ),
-
-               'jquery.util.EventSingletonManager' => $moduleTemplate + array(
-                       'scripts' => array(
-                               'jquery/jquery.util.EventSingletonManager.js',
-                       ),
-                       'dependencies' => array(
-                               'jquery.throttle-debounce',
-                       ),
-               ),
-
                'wikibase.dataTypes' => $moduleTemplate + array(
                        'scripts' => array(
                                'wikibase.dataTypes/wikibase.dataTypes.js',
diff --git a/lib/tests/qunit/resources.php b/lib/tests/qunit/resources.php
index 7135dec..7fa6e95 100644
--- a/lib/tests/qunit/resources.php
+++ b/lib/tests/qunit/resources.php
@@ -35,33 +35,6 @@
                        ),
                ),
 
-               'jquery.removeClassByRegex.tests' => $moduleBase + array(
-                       'scripts' => array(
-                               'jquery/jquery.removeClassByRegex.tests.js',
-                       ),
-                       'dependencies' => array(
-                               'jquery.removeClassByRegex',
-                       ),
-               ),
-
-               'jquery.sticknode.tests' => $moduleBase + array(
-                       'scripts' => array(
-                               'jquery/jquery.sticknode.tests.js',
-                       ),
-                       'dependencies' => array(
-                               'jquery.sticknode',
-                       ),
-               ),
-
-               'jquery.util.EventSingletonManager.tests' => $moduleBase + 
array(
-                       'scripts' => array(
-                               
'jquery/jquery.util.EventSingletonManager.tests.js',
-                       ),
-                       'dependencies' => array(
-                               'jquery.util.EventSingletonManager',
-                       ),
-               ),
-
                'wikibase.dataTypes.tests' => $moduleBase + array(
                        'scripts' => array(
                                
'wikibase.dataTypes/wikibase.dataTypes.tests.js',
diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index 99ca550..229f328 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -25,6 +25,30 @@
 
        $modules = array(
 
+               'jquery.removeClassByRegex' => $moduleTemplate + array(
+                       'scripts' => array(
+                               'jquery/jquery.removeClassByRegex.js',
+                       ),
+               ),
+
+               'jquery.sticknode' => $moduleTemplate + array(
+                       'scripts' => array(
+                               'jquery/jquery.sticknode.js',
+                       ),
+                       'dependencies' => array(
+                               'jquery.util.EventSingletonManager',
+                       ),
+               ),
+
+               'jquery.util.EventSingletonManager' => $moduleTemplate + array(
+                       'scripts' => array(
+                               'jquery/jquery.util.EventSingletonManager.js',
+                       ),
+                       'dependencies' => array(
+                               'jquery.throttle-debounce',
+                       ),
+               ),
+
                'jquery.ui.tagadata' => $moduleTemplate + array(
                        'scripts' => array(
                                'jquery.ui/jquery.ui.tagadata.js',
diff --git a/lib/resources/jquery/jquery.removeClassByRegex.js 
b/repo/resources/jquery/jquery.removeClassByRegex.js
similarity index 100%
rename from lib/resources/jquery/jquery.removeClassByRegex.js
rename to repo/resources/jquery/jquery.removeClassByRegex.js
diff --git a/lib/resources/jquery/jquery.sticknode.js 
b/repo/resources/jquery/jquery.sticknode.js
similarity index 100%
rename from lib/resources/jquery/jquery.sticknode.js
rename to repo/resources/jquery/jquery.sticknode.js
diff --git a/lib/resources/jquery/jquery.util.EventSingletonManager.js 
b/repo/resources/jquery/jquery.util.EventSingletonManager.js
similarity index 100%
rename from lib/resources/jquery/jquery.util.EventSingletonManager.js
rename to repo/resources/jquery/jquery.util.EventSingletonManager.js
diff --git a/lib/tests/qunit/jquery/jquery.removeClassByRegex.tests.js 
b/repo/tests/qunit/jquery/jquery.removeClassByRegex.tests.js
similarity index 100%
rename from lib/tests/qunit/jquery/jquery.removeClassByRegex.tests.js
rename to repo/tests/qunit/jquery/jquery.removeClassByRegex.tests.js
diff --git a/lib/tests/qunit/jquery/jquery.sticknode.tests.js 
b/repo/tests/qunit/jquery/jquery.sticknode.tests.js
similarity index 100%
rename from lib/tests/qunit/jquery/jquery.sticknode.tests.js
rename to repo/tests/qunit/jquery/jquery.sticknode.tests.js
diff --git a/lib/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js 
b/repo/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
similarity index 100%
rename from lib/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
rename to repo/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php
index 0dad287..5462f46 100644
--- a/repo/tests/qunit/resources.php
+++ b/repo/tests/qunit/resources.php
@@ -17,6 +17,33 @@
 
        $modules = array(
 
+               'jquery.removeClassByRegex.tests' => $moduleBase + array(
+                       'scripts' => array(
+                               'jquery/jquery.removeClassByRegex.tests.js',
+                       ),
+                       'dependencies' => array(
+                               'jquery.removeClassByRegex',
+                       ),
+               ),
+
+               'jquery.sticknode.tests' => $moduleBase + array(
+                       'scripts' => array(
+                               'jquery/jquery.sticknode.tests.js',
+                       ),
+                       'dependencies' => array(
+                               'jquery.sticknode',
+                       ),
+               ),
+
+               'jquery.util.EventSingletonManager.tests' => $moduleBase + 
array(
+                       'scripts' => array(
+                               
'jquery/jquery.util.EventSingletonManager.tests.js',
+                       ),
+                       'dependencies' => array(
+                               'jquery.util.EventSingletonManager',
+                       ),
+               ),
+
                'jquery.ui.tagadata.tests' => $moduleBase + array(
                        'scripts' => array(
                                'jquery.ui/jquery.ui.tagadata.tests.js',

-- 
To view, visit https://gerrit.wikimedia.org/r/172986
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b0865ace791d9b3991f83c724f2d7caa3592282
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <adrian.l...@wikimedia.de>
Gerrit-Reviewer: Henning Snater <henning.sna...@wikimedia.de>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to