jenkins-bot has submitted this change and it was merged.
Change subject: Move jquery/ from repo to view
......................................................................
Move jquery/ from repo to view
Change-Id: If5fe2a197e7018acc33490a5b7991e2e9148490c
---
M repo/resources/Resources.php
M repo/tests/qunit/resources.php
R view/resources/jquery/jquery.removeClassByRegex.js
R view/resources/jquery/jquery.sticknode.js
R view/resources/jquery/jquery.util.EventSingletonManager.js
R view/resources/jquery/jquery.util.getDirectionality.js
R view/resources/jquery/resources.php
M view/resources/resources.php
R view/tests/qunit/jquery/jquery.removeClassByRegex.tests.js
R view/tests/qunit/jquery/jquery.sticknode.tests.js
R view/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
R view/tests/qunit/jquery/jquery.util.getDirectionality.tests.js
R view/tests/qunit/jquery/resources.php
M view/tests/qunit/resources.php
14 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index 302282e..a4dcd53 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -286,7 +286,6 @@
include( __DIR__ . '/experts/resources.php' ),
include( __DIR__ . '/formatters/resources.php' ),
include( __DIR__ . '/parsers/resources.php' ),
- include( __DIR__ . '/jquery/resources.php' ),
include( __DIR__ . '/store/resources.php' )
);
} );
diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php
index ed7a020..aa60b8b 100644
--- a/repo/tests/qunit/resources.php
+++ b/repo/tests/qunit/resources.php
@@ -126,7 +126,6 @@
return array_merge(
$modules,
- include( __DIR__ . '/jquery/resources.php' ),
include __DIR__ . '/store/resources.php',
include __DIR__ . '/utilities/resources.php'
);
diff --git a/repo/resources/jquery/jquery.removeClassByRegex.js
b/view/resources/jquery/jquery.removeClassByRegex.js
similarity index 100%
rename from repo/resources/jquery/jquery.removeClassByRegex.js
rename to view/resources/jquery/jquery.removeClassByRegex.js
diff --git a/repo/resources/jquery/jquery.sticknode.js
b/view/resources/jquery/jquery.sticknode.js
similarity index 100%
rename from repo/resources/jquery/jquery.sticknode.js
rename to view/resources/jquery/jquery.sticknode.js
diff --git a/repo/resources/jquery/jquery.util.EventSingletonManager.js
b/view/resources/jquery/jquery.util.EventSingletonManager.js
similarity index 100%
rename from repo/resources/jquery/jquery.util.EventSingletonManager.js
rename to view/resources/jquery/jquery.util.EventSingletonManager.js
diff --git a/repo/resources/jquery/jquery.util.getDirectionality.js
b/view/resources/jquery/jquery.util.getDirectionality.js
similarity index 100%
rename from repo/resources/jquery/jquery.util.getDirectionality.js
rename to view/resources/jquery/jquery.util.getDirectionality.js
diff --git a/repo/resources/jquery/resources.php
b/view/resources/jquery/resources.php
similarity index 100%
rename from repo/resources/jquery/resources.php
rename to view/resources/jquery/resources.php
diff --git a/view/resources/resources.php b/view/resources/resources.php
index 1f3644f..ae40f73 100644
--- a/view/resources/resources.php
+++ b/view/resources/resources.php
@@ -6,6 +6,7 @@
*/
return call_user_func( function() {
return array_merge(
+ include( __DIR__ . '/jquery/resources.php' ),
include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
include( __DIR__ . '/wikibase/view/resources.php' )
);
diff --git a/repo/tests/qunit/jquery/jquery.removeClassByRegex.tests.js
b/view/tests/qunit/jquery/jquery.removeClassByRegex.tests.js
similarity index 100%
rename from repo/tests/qunit/jquery/jquery.removeClassByRegex.tests.js
rename to view/tests/qunit/jquery/jquery.removeClassByRegex.tests.js
diff --git a/repo/tests/qunit/jquery/jquery.sticknode.tests.js
b/view/tests/qunit/jquery/jquery.sticknode.tests.js
similarity index 100%
rename from repo/tests/qunit/jquery/jquery.sticknode.tests.js
rename to view/tests/qunit/jquery/jquery.sticknode.tests.js
diff --git a/repo/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
b/view/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
similarity index 100%
rename from repo/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
rename to view/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
diff --git a/repo/tests/qunit/jquery/jquery.util.getDirectionality.tests.js
b/view/tests/qunit/jquery/jquery.util.getDirectionality.tests.js
similarity index 100%
rename from repo/tests/qunit/jquery/jquery.util.getDirectionality.tests.js
rename to view/tests/qunit/jquery/jquery.util.getDirectionality.tests.js
diff --git a/repo/tests/qunit/jquery/resources.php
b/view/tests/qunit/jquery/resources.php
similarity index 100%
rename from repo/tests/qunit/jquery/resources.php
rename to view/tests/qunit/jquery/resources.php
diff --git a/view/tests/qunit/resources.php b/view/tests/qunit/resources.php
index 6899951..91449a7 100644
--- a/view/tests/qunit/resources.php
+++ b/view/tests/qunit/resources.php
@@ -5,6 +5,7 @@
* @author Adrian Heine < adrian.he...@wikimedia.de >
*/
return array_merge(
+ include( __DIR__ . '/jquery/resources.php' ),
include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
include( __DIR__ . '/wikibase/view/resources.php' )
);
--
To view, visit https://gerrit.wikimedia.org/r/201162
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If5fe2a197e7018acc33490a5b7991e2e9148490c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <adrian.he...@wikimedia.de>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
