Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172696
Change subject: Move RepoApi files
......................................................................
Move RepoApi files
Change-Id: I25c5ad11352c0f869b99096894f2b0d589dc1490
---
M lib/resources/Resources.php
R lib/resources/api/RepoApi.js
R lib/resources/api/RepoApiError.js
M lib/resources/api/resources.php
D lib/resources/wikibase.RepoApi/resources.php
R lib/tests/qunit/api/RepoApi.tests.js
R lib/tests/qunit/api/RepoApiError.tests.js
M lib/tests/qunit/resources.php
8 files changed, 31 insertions(+), 57 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/96/172696/1
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 7846e87..8013069 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -173,7 +173,6 @@
include( __DIR__ . '/formatters/resources.php' ),
include( __DIR__ . '/jquery.wikibase/resources.php' ),
include( __DIR__ . '/parsers/resources.php' ),
- include( __DIR__ . '/wikibase.RepoApi/resources.php' ),
include( __DIR__ . '/wikibase.store/resources.php' ),
include( __DIR__ . '/wikibase.utilities/resources.php' )
);
diff --git a/lib/resources/wikibase.RepoApi/wikibase.RepoApi.js
b/lib/resources/api/RepoApi.js
similarity index 100%
rename from lib/resources/wikibase.RepoApi/wikibase.RepoApi.js
rename to lib/resources/api/RepoApi.js
diff --git a/lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js
b/lib/resources/api/RepoApiError.js
similarity index 100%
rename from lib/resources/wikibase.RepoApi/wikibase.RepoApiError.js
rename to lib/resources/api/RepoApiError.js
diff --git a/lib/resources/api/resources.php b/lib/resources/api/resources.php
index 778ee55..2b81676 100644
--- a/lib/resources/api/resources.php
+++ b/lib/resources/api/resources.php
@@ -57,6 +57,35 @@
)
),
+ 'wikibase.api.RepoApi' => $moduleTemplate + array(
+ 'scripts' => array(
+ 'RepoApi.js',
+ ),
+ 'dependencies' => array(
+ 'json',
+ 'wikibase.api.__namespace',
+ ),
+ ),
+
+ 'wikibase.api.RepoApiError' => $moduleTemplate + array(
+ 'scripts' => array(
+ 'RepoApiError.js',
+ ),
+ 'messages' => array(
+ 'wikibase-error-unexpected',
+ 'wikibase-error-save-generic',
+ 'wikibase-error-remove-generic',
+ 'wikibase-error-save-timeout',
+ 'wikibase-error-remove-timeout',
+ 'wikibase-error-ui-no-external-page',
+ 'wikibase-error-ui-edit-conflict',
+ ),
+ 'dependencies' => array(
+ 'util.inherit',
+ 'wikibase.api.__namespace',
+ ),
+ ),
+
);
} );
diff --git a/lib/resources/wikibase.RepoApi/resources.php
b/lib/resources/wikibase.RepoApi/resources.php
deleted file mode 100644
index 4403ed4..0000000
--- a/lib/resources/wikibase.RepoApi/resources.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * @licence GNU GPL v2+
- * @author H. Snater < [email protected] >
- *
- * @codeCoverageIgnoreStart
- */
-return call_user_func( function() {
- preg_match(
- '+' . preg_quote( DIRECTORY_SEPARATOR, '+' ) .
'((?:vendor|extensions)' .
- preg_quote( DIRECTORY_SEPARATOR, '+' ) . '.*)$+',
- __DIR__,
- $remoteExtPathParts
- );
- $moduleTemplate = array(
- 'localBasePath' => __DIR__,
- 'remoteExtPath' => '..' . DIRECTORY_SEPARATOR .
$remoteExtPathParts[1],
- );
-
- $modules = array(
-
- 'wikibase.api.RepoApi' => $moduleTemplate + array(
- 'scripts' => array(
- 'wikibase.RepoApi.js',
- ),
- 'dependencies' => array(
- 'json',
- 'wikibase.api.__namespace',
- ),
- ),
-
- 'wikibase.api.RepoApiError' => $moduleTemplate + array(
- 'scripts' => array(
- 'wikibase.RepoApiError.js',
- ),
- 'messages' => array(
- 'wikibase-error-unexpected',
- 'wikibase-error-save-generic',
- 'wikibase-error-remove-generic',
- 'wikibase-error-save-timeout',
- 'wikibase-error-remove-timeout',
- 'wikibase-error-ui-no-external-page',
- 'wikibase-error-ui-edit-conflict',
- ),
- 'dependencies' => array(
- 'util.inherit',
- 'wikibase.api.__namespace',
- ),
- ),
-
- );
-
- return $modules;
-} );
diff --git a/lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApi.tests.js
b/lib/tests/qunit/api/RepoApi.tests.js
similarity index 100%
rename from lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApi.tests.js
rename to lib/tests/qunit/api/RepoApi.tests.js
diff --git a/lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApiError.tests.js
b/lib/tests/qunit/api/RepoApiError.tests.js
similarity index 100%
rename from lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApiError.tests.js
rename to lib/tests/qunit/api/RepoApiError.tests.js
diff --git a/lib/tests/qunit/resources.php b/lib/tests/qunit/resources.php
index 1fda429..1263bd8 100644
--- a/lib/tests/qunit/resources.php
+++ b/lib/tests/qunit/resources.php
@@ -74,7 +74,7 @@
'wikibase.api.RepoApi.tests' => $moduleBase + array(
'scripts' => array(
- 'wikibase.RepoApi/wikibase.RepoApi.tests.js',
+ 'api/RepoApi.tests.js',
),
'dependencies' => array(
'wikibase',
@@ -85,7 +85,7 @@
'wikibase.api.RepoApiError.tests' => $moduleBase + array(
'scripts' => array(
-
'wikibase.RepoApi/wikibase.RepoApiError.tests.js',
+ 'api/RepoApiError.tests.js',
),
'dependencies' => array(
'wikibase',
--
To view, visit https://gerrit.wikimedia.org/r/172696
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I25c5ad11352c0f869b99096894f2b0d589dc1490
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
