Adrian Lang has uploaded a new change for review. https://gerrit.wikimedia.org/r/172736
Change subject: Move shared stuff in jquery.wikibase to jquery.wikibase-shared ...................................................................... Move shared stuff in jquery.wikibase to jquery.wikibase-shared This allows us to just move jquery.wikibase to repo and then move jquery.wikibase-shared to jquery.wikibase. Change-Id: I988cc63494260d67c261287ce3f2e92f78ce7880 --- R lib/resources/jquery.wikibase-shared/jquery.wikibase.siteselector.js R lib/resources/jquery.wikibase-shared/jquery.wikibase.wbtooltip.js A lib/resources/jquery.wikibase-shared/resources.php R lib/resources/jquery.wikibase-shared/themes/default/jquery.wikibase.wbtooltip.css M lib/resources/jquery.wikibase/resources.php R lib/tests/qunit/jquery.wikibase-shared/jquery.wikibase.siteselector.tests.js R lib/tests/qunit/jquery.wikibase-shared/jquery.wikibase.wbtooltip.tests.js A lib/tests/qunit/jquery.wikibase-shared/resources.php M lib/tests/qunit/jquery.wikibase/resources.php M lib/tests/qunit/resources.php 10 files changed, 100 insertions(+), 49 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/36/172736/1 diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js b/lib/resources/jquery.wikibase-shared/jquery.wikibase.siteselector.js similarity index 100% rename from lib/resources/jquery.wikibase/jquery.wikibase.siteselector.js rename to lib/resources/jquery.wikibase-shared/jquery.wikibase.siteselector.js diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js b/lib/resources/jquery.wikibase-shared/jquery.wikibase.wbtooltip.js similarity index 100% rename from lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js rename to lib/resources/jquery.wikibase-shared/jquery.wikibase.wbtooltip.js diff --git a/lib/resources/jquery.wikibase-shared/resources.php b/lib/resources/jquery.wikibase-shared/resources.php new file mode 100644 index 0000000..c63cbcd --- /dev/null +++ b/lib/resources/jquery.wikibase-shared/resources.php @@ -0,0 +1,55 @@ +<?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( + + 'jquery.wikibase.siteselector' => $moduleTemplate + array( + 'scripts' => array( + 'jquery.wikibase.siteselector.js', + ), + 'dependencies' => array( + 'jquery.event.special.eachchange', + 'jquery.ui.ooMenu', + 'jquery.ui.suggester', + 'util.highlightSubstring', + ), + ), + + 'jquery.wikibase.wbtooltip' => $moduleTemplate + array( + 'scripts' => array( + 'jquery.wikibase.wbtooltip.js', + ), + 'styles' => array( + 'themes/default/jquery.wikibase.wbtooltip.css' + ), + 'dependencies' => array( + 'jquery.tipsy', + 'jquery.ui.toggler', + 'jquery.ui.widget', + ), + 'messages' => array( + 'wikibase-tooltip-error-details', + ), + ), + + ); + + return $modules; + +} ); diff --git a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.wbtooltip.css b/lib/resources/jquery.wikibase-shared/themes/default/jquery.wikibase.wbtooltip.css similarity index 100% rename from lib/resources/jquery.wikibase/themes/default/jquery.wikibase.wbtooltip.css rename to lib/resources/jquery.wikibase-shared/themes/default/jquery.wikibase.wbtooltip.css diff --git a/lib/resources/jquery.wikibase/resources.php b/lib/resources/jquery.wikibase/resources.php index 312fb0b..6a4f5a9 100644 --- a/lib/resources/jquery.wikibase/resources.php +++ b/lib/resources/jquery.wikibase/resources.php @@ -402,18 +402,6 @@ ), ), - 'jquery.wikibase.siteselector' => $moduleTemplate + array( - 'scripts' => array( - 'jquery.wikibase.siteselector.js', - ), - 'dependencies' => array( - 'jquery.event.special.eachchange', - 'jquery.ui.ooMenu', - 'jquery.ui.suggester', - 'util.highlightSubstring', - ), - ), - 'jquery.wikibase.snaklistview' => $moduleTemplate + array( 'scripts' => array( 'jquery.wikibase.snaklistview.js', @@ -460,23 +448,6 @@ 'wikibase-statementview-referencesheading-pendingcountersubject', 'wikibase-statementview-referencesheading-pendingcountertooltip', 'wikibase-addreference', - ), - ), - - 'jquery.wikibase.wbtooltip' => $moduleTemplate + array( - 'scripts' => array( - 'jquery.wikibase.wbtooltip.js', - ), - 'styles' => array( - 'themes/default/jquery.wikibase.wbtooltip.css' - ), - 'dependencies' => array( - 'jquery.tipsy', - 'jquery.ui.toggler', - 'jquery.ui.widget', - ), - 'messages' => array( - 'wikibase-tooltip-error-details', ), ), diff --git a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.siteselector.tests.js b/lib/tests/qunit/jquery.wikibase-shared/jquery.wikibase.siteselector.tests.js similarity index 100% rename from lib/tests/qunit/jquery.wikibase/jquery.wikibase.siteselector.tests.js rename to lib/tests/qunit/jquery.wikibase-shared/jquery.wikibase.siteselector.tests.js diff --git a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.wbtooltip.tests.js b/lib/tests/qunit/jquery.wikibase-shared/jquery.wikibase.wbtooltip.tests.js similarity index 100% rename from lib/tests/qunit/jquery.wikibase/jquery.wikibase.wbtooltip.tests.js rename to lib/tests/qunit/jquery.wikibase-shared/jquery.wikibase.wbtooltip.tests.js diff --git a/lib/tests/qunit/jquery.wikibase-shared/resources.php b/lib/tests/qunit/jquery.wikibase-shared/resources.php new file mode 100644 index 0000000..06b7b70 --- /dev/null +++ b/lib/tests/qunit/jquery.wikibase-shared/resources.php @@ -0,0 +1,43 @@ +<?php + +/** + * @licence GNU GPL v2+ + * @author H. Snater < [email protected] > + * + * @codeCoverageIgnoreStart + */ +return call_user_func( function() { + $remoteExtPathParts = explode( + DIRECTORY_SEPARATOR . 'extensions' . DIRECTORY_SEPARATOR, __DIR__, 2 + ); + $moduleBase = array( + 'localBasePath' => __DIR__, + 'remoteExtPath' => $remoteExtPathParts[1], + ); + + $modules = array( + + 'jquery.wikibase.siteselector.tests' => $moduleBase + array( + 'scripts' => array( + 'jquery.wikibase.siteselector.tests.js', + ), + 'dependencies' => array( + 'jquery.wikibase.siteselector', + 'wikibase.Site', + ), + ), + + 'jquery.wikibase.wbtooltip.tests' => $moduleBase + array( + 'scripts' => array( + 'jquery.wikibase.wbtooltip.tests.js', + ), + 'dependencies' => array( + 'jquery.wikibase.wbtooltip', + ), + ), + + ); + + return $modules; + +} ); diff --git a/lib/tests/qunit/jquery.wikibase/resources.php b/lib/tests/qunit/jquery.wikibase/resources.php index 071c68f..010a63e 100644 --- a/lib/tests/qunit/jquery.wikibase/resources.php +++ b/lib/tests/qunit/jquery.wikibase/resources.php @@ -225,16 +225,6 @@ ), ), - 'jquery.wikibase.siteselector.tests' => $moduleBase + array( - 'scripts' => array( - 'jquery.wikibase.siteselector.tests.js', - ), - 'dependencies' => array( - 'jquery.wikibase.siteselector', - 'wikibase.Site', - ), - ), - 'jquery.wikibase.snaklistview.tests' => $moduleBase + array( 'scripts' => array( 'jquery.wikibase.snaklistview.tests.js', @@ -268,15 +258,6 @@ 'jquery.wikibase.statementview', 'test.sinonjs', 'wikibase.datamodel', - ), - ), - - 'jquery.wikibase.wbtooltip.tests' => $moduleBase + array( - 'scripts' => array( - 'jquery.wikibase.wbtooltip.tests.js', - ), - 'dependencies' => array( - 'jquery.wikibase.wbtooltip', ), ), diff --git a/lib/tests/qunit/resources.php b/lib/tests/qunit/resources.php index 1fda429..2318c92 100644 --- a/lib/tests/qunit/resources.php +++ b/lib/tests/qunit/resources.php @@ -180,7 +180,8 @@ return array_merge( $modules, include( __DIR__ . '/entityChangers/resources.php' ), - include( __DIR__ . '/jquery.wikibase/resources.php' ) + include( __DIR__ . '/jquery.wikibase/resources.php' ), + include( __DIR__ . '/jquery.wikibase-shared/resources.php' ) ); } ); -- To view, visit https://gerrit.wikimedia.org/r/172736 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I988cc63494260d67c261287ce3f2e92f78ce7880 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
