[MediaWiki-commits] [Gerrit] Move wikibase.utilities from lib/ to view/ - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Move wikibase.utilities from lib/ to view/
..
Move wikibase.utilities from lib/ to view/
Tests were in repo/.
Change-Id: Ia97dc94b461a318c891910f183881a54546853af
---
M lib/resources/Resources.php
M repo/tests/qunit/resources.php
M view/resources/resources.php
R view/resources/wikibase/utilities/resources.php
R view/resources/wikibase/utilities/wikibase.utilities.ClaimGuidGenerator.js
R view/resources/wikibase/utilities/wikibase.utilities.GuidGenerator.js
R view/resources/wikibase/utilities/wikibase.utilities.js
R view/resources/wikibase/utilities/wikibase.utilities.ui.css
R view/resources/wikibase/utilities/wikibase.utilities.ui.js
M view/tests/qunit/resources.php
R view/tests/qunit/wikibase/utilities/ClaimGuidGenerator.tests.js
R view/tests/qunit/wikibase/utilities/GuidGenerator.tests.js
R view/tests/qunit/wikibase/utilities/resources.php
13 files changed, 4 insertions(+), 6 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 9f3d893..ce24339 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -78,8 +78,7 @@
$modules = array_merge(
$modules,
include( __DIR__ . '/deprecated/resources.php' ),
- include( __DIR__ . '/jquery.wikibase-shared/resources.php' ),
- include( __DIR__ . '/utilities/resources.php' )
+ include( __DIR__ . '/jquery.wikibase-shared/resources.php' )
);
if ( defined( 'ULS_VERSION' ) ) {
diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php
index bed600c..f63ef54 100644
--- a/repo/tests/qunit/resources.php
+++ b/repo/tests/qunit/resources.php
@@ -58,9 +58,6 @@
);
- return array_merge(
- $modules,
- include __DIR__ . '/utilities/resources.php'
- );
+ return $modules;
} );
diff --git a/view/resources/resources.php b/view/resources/resources.php
index 928d2cf..e4a0c75 100644
--- a/view/resources/resources.php
+++ b/view/resources/resources.php
@@ -12,6 +12,7 @@
include( __DIR__ . '/wikibase/resources.php' ),
include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
include( __DIR__ . '/wikibase/store/resources.php' ),
+ include( __DIR__ . '/wikibase/utilities/resources.php' ),
include( __DIR__ . '/wikibase/view/resources.php' )
);
} );
diff --git a/lib/resources/utilities/resources.php
b/view/resources/wikibase/utilities/resources.php
similarity index 100%
rename from lib/resources/utilities/resources.php
rename to view/resources/wikibase/utilities/resources.php
diff --git a/lib/resources/utilities/wikibase.utilities.ClaimGuidGenerator.js
b/view/resources/wikibase/utilities/wikibase.utilities.ClaimGuidGenerator.js
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.ClaimGuidGenerator.js
rename to
view/resources/wikibase/utilities/wikibase.utilities.ClaimGuidGenerator.js
diff --git a/lib/resources/utilities/wikibase.utilities.GuidGenerator.js
b/view/resources/wikibase/utilities/wikibase.utilities.GuidGenerator.js
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.GuidGenerator.js
rename to view/resources/wikibase/utilities/wikibase.utilities.GuidGenerator.js
diff --git a/lib/resources/utilities/wikibase.utilities.js
b/view/resources/wikibase/utilities/wikibase.utilities.js
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.js
rename to view/resources/wikibase/utilities/wikibase.utilities.js
diff --git a/lib/resources/utilities/wikibase.utilities.ui.css
b/view/resources/wikibase/utilities/wikibase.utilities.ui.css
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.ui.css
rename to view/resources/wikibase/utilities/wikibase.utilities.ui.css
diff --git a/lib/resources/utilities/wikibase.utilities.ui.js
b/view/resources/wikibase/utilities/wikibase.utilities.ui.js
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.ui.js
rename to view/resources/wikibase/utilities/wikibase.utilities.ui.js
diff --git a/view/tests/qunit/resources.php b/view/tests/qunit/resources.php
index e896484..5d09c1d 100644
--- a/view/tests/qunit/resources.php
+++ b/view/tests/qunit/resources.php
@@ -11,5 +11,6 @@
include( __DIR__ . '/wikibase/resources.php' ),
include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
include( __DIR__ . '/wikibase/store/resources.php' ),
+ include( __DIR__ . '/wikibase/utilities/resources.php' ),
include( __DIR__ . '/wikibase/view/resources.php' )
);
diff --git a/repo/tests/qunit/utilities/ClaimGuidGenerator.tests.js
b/view/tests/qunit/wikibase/utilities/ClaimGuidGener
[MediaWiki-commits] [Gerrit] Move wikibase.utilities from lib/ to view/ - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201174
Change subject: Move wikibase.utilities from lib/ to view/
..
Move wikibase.utilities from lib/ to view/
Tests were in repo/.
Change-Id: Ia97dc94b461a318c891910f183881a54546853af
---
M lib/resources/Resources.php
M repo/tests/qunit/resources.php
M view/resources/resources.php
R view/resources/wikibase/utilities/resources.php
R view/resources/wikibase/utilities/wikibase.utilities.ClaimGuidGenerator.js
R view/resources/wikibase/utilities/wikibase.utilities.GuidGenerator.js
R view/resources/wikibase/utilities/wikibase.utilities.js
R view/resources/wikibase/utilities/wikibase.utilities.ui.css
R view/resources/wikibase/utilities/wikibase.utilities.ui.js
M view/tests/qunit/resources.php
R view/tests/qunit/wikibase/utilities/ClaimGuidGenerator.tests.js
R view/tests/qunit/wikibase/utilities/GuidGenerator.tests.js
R view/tests/qunit/wikibase/utilities/resources.php
13 files changed, 4 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/74/201174/1
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 9f3d893..ce24339 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -78,8 +78,7 @@
$modules = array_merge(
$modules,
include( __DIR__ . '/deprecated/resources.php' ),
- include( __DIR__ . '/jquery.wikibase-shared/resources.php' ),
- include( __DIR__ . '/utilities/resources.php' )
+ include( __DIR__ . '/jquery.wikibase-shared/resources.php' )
);
if ( defined( 'ULS_VERSION' ) ) {
diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php
index bed600c..f63ef54 100644
--- a/repo/tests/qunit/resources.php
+++ b/repo/tests/qunit/resources.php
@@ -58,9 +58,6 @@
);
- return array_merge(
- $modules,
- include __DIR__ . '/utilities/resources.php'
- );
+ return $modules;
} );
diff --git a/view/resources/resources.php b/view/resources/resources.php
index 928d2cf..e4a0c75 100644
--- a/view/resources/resources.php
+++ b/view/resources/resources.php
@@ -12,6 +12,7 @@
include( __DIR__ . '/wikibase/resources.php' ),
include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
include( __DIR__ . '/wikibase/store/resources.php' ),
+ include( __DIR__ . '/wikibase/utilities/resources.php' ),
include( __DIR__ . '/wikibase/view/resources.php' )
);
} );
diff --git a/lib/resources/utilities/resources.php
b/view/resources/wikibase/utilities/resources.php
similarity index 100%
rename from lib/resources/utilities/resources.php
rename to view/resources/wikibase/utilities/resources.php
diff --git a/lib/resources/utilities/wikibase.utilities.ClaimGuidGenerator.js
b/view/resources/wikibase/utilities/wikibase.utilities.ClaimGuidGenerator.js
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.ClaimGuidGenerator.js
rename to
view/resources/wikibase/utilities/wikibase.utilities.ClaimGuidGenerator.js
diff --git a/lib/resources/utilities/wikibase.utilities.GuidGenerator.js
b/view/resources/wikibase/utilities/wikibase.utilities.GuidGenerator.js
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.GuidGenerator.js
rename to view/resources/wikibase/utilities/wikibase.utilities.GuidGenerator.js
diff --git a/lib/resources/utilities/wikibase.utilities.js
b/view/resources/wikibase/utilities/wikibase.utilities.js
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.js
rename to view/resources/wikibase/utilities/wikibase.utilities.js
diff --git a/lib/resources/utilities/wikibase.utilities.ui.css
b/view/resources/wikibase/utilities/wikibase.utilities.ui.css
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.ui.css
rename to view/resources/wikibase/utilities/wikibase.utilities.ui.css
diff --git a/lib/resources/utilities/wikibase.utilities.ui.js
b/view/resources/wikibase/utilities/wikibase.utilities.ui.js
similarity index 100%
rename from lib/resources/utilities/wikibase.utilities.ui.js
rename to view/resources/wikibase/utilities/wikibase.utilities.ui.js
diff --git a/view/tests/qunit/resources.php b/view/tests/qunit/resources.php
index e896484..5d09c1d 100644
--- a/view/tests/qunit/resources.php
+++ b/view/tests/qunit/resources.php
@@ -11,5 +11,6 @@
include( __DIR__ . '/wikibase/resources.php' ),
include( __DIR__ . '/wikibase/entityChangers/resources.php' ),
include( __DIR__ . '/wikibase/store/resources.php' ),
+ include( __DIR__ . '/wikibase/utilities/resources.php' ),
include( __DIR__ . '/wikibase/view/resources.php' )
);
diff --git a/repo/tests/qunit/utilities/ClaimGuidGenerator.tes
