[MediaWiki-commits] [Gerrit] Implemented jQuery.wikibase.labelview - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has submitted this change and it was merged. Change subject: Implemented jQuery.wikibase.labelview .. Implemented jQuery.wikibase.labelview jQuery.wikibase.labelview replaces EditableLabel and LabelEditTool. PropertyEditTool and corresponding components have become obsolete by this change set and are removed in a subsequent change set. Change-Id: Id36ab9c2dd0a3acb0c19e34c3ce8c8b2e7b954bb --- M lib/WikibaseLib.hooks.php M lib/resources/Resources.php M lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js A lib/resources/jquery.wikibase/jquery.wikibase.labelview.js A lib/resources/jquery.wikibase/themes/default/jquery.wikibase.labelview.css M lib/resources/templates.php M lib/resources/wikibase.css D lib/resources/wikibase.ui.LabelEditTool.js D lib/resources/wikibase.ui.PropertyEditTool.EditableLabel.js M lib/resources/wikibase.ui.PropertyEditTool.css A lib/tests/qunit/jquery.wikibase/jquery.wikibase.labelview.tests.js D lib/tests/qunit/wikibase.ui.LabelEditTool.tests.js D lib/tests/qunit/wikibase.ui.PropertyEditTool.EditableLabel.tests.js M repo/includes/View/FingerprintView.php M repo/resources/Resources.php M repo/resources/wikibase.ui.entityViewInit.js M repo/resources/wikibase.ui.initTermBox.js M repo/tests/phpunit/includes/View/FingerprintViewTest.php M repo/tests/phpunit/includes/actions/EditEntityActionTest.php 19 files changed, 979 insertions(+), 564 deletions(-) Approvals: Thiemo Mättig (WMDE): Looks good to me, approved jenkins-bot: Verified diff --git a/lib/WikibaseLib.hooks.php b/lib/WikibaseLib.hooks.php index 3ebd879..a6ac6e3 100644 --- a/lib/WikibaseLib.hooks.php +++ b/lib/WikibaseLib.hooks.php @@ -83,9 +83,7 @@ 'tests/qunit/wikibase.RepoApi/wikibase.RepoApi.tests.js', 'tests/qunit/wikibase.RepoApi/wikibase.RepoApiError.tests.js', - 'tests/qunit/wikibase.ui.LabelEditTool.tests.js', 'tests/qunit/wikibase.ui.PropertyEditTool.tests.js', - 'tests/qunit/wikibase.ui.PropertyEditTool.EditableLabel.tests.js', 'tests/qunit/wikibase.ui.PropertyEditTool.EditableValue.tests.js', 'tests/qunit/wikibase.ui.PropertyEditTool.EditableValue.Interface.tests.js', @@ -169,6 +167,15 @@ ), ); + $testModules['qunit']['jquery.wikibase.labelview.tests'] = $moduleBase + array( + 'scripts' = array( + 'tests/qunit/jquery.wikibase/jquery.wikibase.labelview.tests.js', + ), + 'dependencies' = array( + 'jquery.wikibase.labelview', + ), + ); + $testModules['qunit']['jquery.wikibase.listview.tests'] = $moduleBase + array( 'scripts' = array( 'tests/qunit/jquery.wikibase/jquery.wikibase.listview.tests.js', diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php index a376993..e5b5810 100644 --- a/lib/resources/Resources.php +++ b/lib/resources/Resources.php @@ -30,6 +30,7 @@ 'wikibase.css', 'jquery.wikibase/themes/default/jquery.wikibase.aliasesview.css', 'jquery.wikibase/themes/default/jquery.wikibase.descriptionview.css', + 'jquery.wikibase/themes/default/jquery.wikibase.labelview.css', 'jquery.wikibase/themes/default/jquery.wikibase.sitelinklistview.css', 'jquery.wikibase/themes/default/jquery.wikibase.sitelinkview.css', ) @@ -301,8 +302,6 @@ 'wikibase.ui.PropertyEditTool.js', 'wikibase.ui.PropertyEditTool.EditableValue.js', 'wikibase.ui.PropertyEditTool.EditableValue.Interface.js', - 'wikibase.ui.PropertyEditTool.EditableLabel.js', - 'wikibase.ui.LabelEditTool.js', ), 'styles' = array( 'wikibase.ui.PropertyEditTool.css' @@ -505,6 +504,22 @@ ), ), + 'jquery.wikibase.labelview' = $moduleTemplate + array( + 'scripts' = array( + 'jquery.wikibase/jquery.wikibase.labelview.js' + ), + 'styles' = array( + 'jquery.wikibase/themes/default/jquery.wikibase.labelview.css', + ), + 'dependencies' = array( +
[MediaWiki-commits] [Gerrit] Implemented jQuery.wikibase.labelview - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review. https://gerrit.wikimedia.org/r/154394 Change subject: Implemented jQuery.wikibase.labelview .. Implemented jQuery.wikibase.labelview jQuery.wikibase.labelview replaces EditableLabel and LabelEditTool. PropertyEditTool and corresponding components have become obsolete by this change set and are removed in a subsequent change set. Change-Id: Id36ab9c2dd0a3acb0c19e34c3ce8c8b2e7b954bb --- M lib/WikibaseLib.hooks.php M lib/resources/Resources.php M lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js A lib/resources/jquery.wikibase/jquery.wikibase.labelview.js A lib/resources/jquery.wikibase/themes/default/jquery.wikibase.labelview.css M lib/resources/templates.php M lib/resources/wikibase.css D lib/resources/wikibase.ui.LabelEditTool.js D lib/resources/wikibase.ui.PropertyEditTool.EditableLabel.js M lib/resources/wikibase.ui.PropertyEditTool.css A lib/tests/qunit/jquery.wikibase/jquery.wikibase.labelview.tests.js D lib/tests/qunit/wikibase.ui.LabelEditTool.tests.js D lib/tests/qunit/wikibase.ui.PropertyEditTool.EditableLabel.tests.js M repo/includes/EntityView.php M repo/resources/Resources.php M repo/resources/wikibase.ui.entityViewInit.js M repo/resources/wikibase.ui.initTermBox.js 17 files changed, 961 insertions(+), 555 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/94/154394/6 diff --git a/lib/WikibaseLib.hooks.php b/lib/WikibaseLib.hooks.php index f7c859a..e19c1d7 100644 --- a/lib/WikibaseLib.hooks.php +++ b/lib/WikibaseLib.hooks.php @@ -83,9 +83,7 @@ 'tests/qunit/wikibase.RepoApi/wikibase.RepoApi.tests.js', 'tests/qunit/wikibase.RepoApi/wikibase.RepoApiError.tests.js', - 'tests/qunit/wikibase.ui.LabelEditTool.tests.js', 'tests/qunit/wikibase.ui.PropertyEditTool.tests.js', - 'tests/qunit/wikibase.ui.PropertyEditTool.EditableLabel.tests.js', 'tests/qunit/wikibase.ui.PropertyEditTool.EditableValue.tests.js', 'tests/qunit/wikibase.ui.PropertyEditTool.EditableValue.Interface.tests.js', @@ -170,6 +168,15 @@ ), ); + $testModules['qunit']['jquery.wikibase.labelview.tests'] = $moduleBase + array( + 'scripts' = array( + 'tests/qunit/jquery.wikibase/jquery.wikibase.labelview.tests.js', + ), + 'dependencies' = array( + 'jquery.wikibase.labelview', + ), + ); + $testModules['qunit']['jquery.wikibase.listview.tests'] = $moduleBase + array( 'scripts' = array( 'tests/qunit/jquery.wikibase/jquery.wikibase.listview.tests.js', diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php index dc36178..0ec5dc9 100644 --- a/lib/resources/Resources.php +++ b/lib/resources/Resources.php @@ -299,8 +299,6 @@ 'wikibase.ui.PropertyEditTool.js', 'wikibase.ui.PropertyEditTool.EditableValue.js', 'wikibase.ui.PropertyEditTool.EditableValue.Interface.js', - 'wikibase.ui.PropertyEditTool.EditableLabel.js', - 'wikibase.ui.LabelEditTool.js', ), 'styles' = array( 'wikibase.ui.PropertyEditTool.css' @@ -502,6 +500,23 @@ ), ), + 'jquery.wikibase.labelview' = $moduleTemplate + array( + 'scripts' = array( + 'jquery.wikibase/jquery.wikibase.labelview.js' + ), + 'styles' = array( + 'jquery.wikibase/themes/default/jquery.wikibase.labelview.css', + ), + 'dependencies' = array( + 'jquery', + 'jquery.ui.TemplatedWidget', + 'jquery.wikibase.edittoolbar', + 'jquery.wikibase.toolbarcontroller', + 'wikibase', + 'wikibase.RepoApiError', + ), + ), + 'jquery.wikibase.sitelinkgroupview' = $moduleTemplate + array( 'scripts' = array( 'jquery.wikibase/jquery.wikibase.sitelinkgroupview.js' diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
