jenkins-bot has submitted this change and it was merged.
Change subject: Remove unused feature from labelview
......................................................................
Remove unused feature from labelview
Labelview was able to show the entityId next to the label, but that feature is
unused.
Change-Id: Ifb40159bfcd1249a19d1d2bec058d5618419cf3f
---
M
view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
M view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.js
M view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
M view/resources/jquery/wikibase/jquery.wikibase.entityview.js
M view/resources/jquery/wikibase/jquery.wikibase.labelview.js
M view/resources/templates.php
M view/src/EntityTermsView.php
M view/tests/qunit/jquery/wikibase/jquery.wikibase.aliasesview.tests.js
M
view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.tests.js
M
view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.tests.js
M view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsview.tests.js
M view/tests/qunit/jquery/wikibase/jquery.wikibase.labelview.tests.js
12 files changed, 4 insertions(+), 38 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
index 4668d21..29ef1cf 100644
---
a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
+++
b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js
@@ -23,8 +23,6 @@
* }[, ...]
* ]
*
- * @option {string} entityId
- *
* @option {wikibase.entityChangers.EntityChangersFactory}
entityChangersFactory
*
* @event change
@@ -61,7 +59,6 @@
$listview:
'.wikibase-entitytermsforlanguagelistview-listview'
},
value: [],
- entityId: null,
entityChangersFactory: null
},
@@ -76,7 +73,6 @@
_create: function() {
if(
!$.isArray( this.options.value )
- || !this.options.entityId
|| !this.options.entityChangersFactory
) {
throw new Error( 'Required option(s) missing' );
@@ -186,7 +182,6 @@
newItemOptionsFn: function( value ) {
return {
value: value,
- entityId: self.options.entityId,
entityChangersFactory:
self.options.entityChangersFactory,
helpMessage: mw.msg(
'wikibase-entitytermsforlanguageview-input-help-message',
diff --git
a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.js
b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.js
index 3f548c2..3a1cefe 100644
---
a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.js
+++
b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.js
@@ -24,8 +24,6 @@
* @option {string} [helpMessage]
* Default: mw.msg(
'wikibase-entitytermsforlanguageview-input-help-message' )
*
- * @option {string} entityId
- *
* @option {wikibase.entityChangers.EntityChangersFactory}
entityChangersFactory
*
* @event change
@@ -79,7 +77,6 @@
},
value: null,
helpMessage: mw.msg(
'wikibase-entitytermsforlanguageview-input-help-message' ),
- entityId: null,
entityChangersFactory: null
},
@@ -107,7 +104,7 @@
* @see jQuery.ui.TemplatedWidget._create
*/
_create: function() {
- if( !this.options.entityId ||
!this.options.entityChangersFactory ) {
+ if( !this.options.entityChangersFactory ) {
throw new Error( 'Required option(s) missing' );
}
@@ -201,7 +198,6 @@
options.descriptionsChanger =
self.options.entityChangersFactory.getDescriptionsChanger();
} else if( widgetName === 'labelview' ) {
options.labelsChanger =
self.options.entityChangersFactory.getLabelsChanger();
- options.entityId = self.options.entityId;
}
self['$' + widgetName][widgetName]( options );
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
index 47868ae..37fa179 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.entitytermsview.js
@@ -23,8 +23,6 @@
* }[, ...]
* ]
*
- * @option {string} entityId
- *
* @option {wikibase.entityChangers.EntityChangersFactory}
entityChangersFactory
*
* @option {string} [helpMessage]
@@ -68,7 +66,6 @@
'.wikibase-entitytermsview-entitytermsforlanguagelistview'
},
value: [],
- entityId: null,
entityChangersFactory: null,
helpMessage: 'Edit label, description and aliases per language.'
},
@@ -94,7 +91,6 @@
_create: function() {
if(
!$.isArray( this.options.value )
- || !this.options.entityId
|| !this.options.entityChangersFactory
) {
throw new Error( 'Required option(s) missing' );
@@ -350,7 +346,6 @@
)
.entitytermsforlanguagelistview( {
value: this.options.value,
- entityId: this.options.entityId,
entityChangersFactory:
this.options.entityChangersFactory
} );
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.entityview.js
b/view/resources/jquery/wikibase/jquery.wikibase.entityview.js
index 787d6f0..ad4c377 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.entityview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.entityview.js
@@ -140,7 +140,6 @@
this.$entityTerms.entitytermsview( {
value: value,
- entityId: this.options.value.getId(),
entityChangersFactory:
this.options.entityChangersFactory,
helpMessage: mw.msg(
'wikibase-entitytermsview-input-help-message' )
} );
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.labelview.js
b/view/resources/jquery/wikibase/jquery.wikibase.labelview.js
index 3564a36..7b216fe 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.labelview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.labelview.js
@@ -17,8 +17,6 @@
* @param {wikibase.datamodel.Term} options.value
* @param {string} [options.helpMessage=mw.msg(
'wikibase-label-input-help-message' )]
* @param {wikibase.entityChangers.LabelsChanger} options.labelsChanger
- * @param {string} options.entityId
- * @param {boolean} [options.showEntityId=false]
*/
$.widget( 'wikibase.labelview', PARENT, {
/**
@@ -30,17 +28,14 @@
templateParams: [
'', // additional class
'', // text
- '', // entity id
'' // toolbar
],
templateShortCuts: {
- $text: '.wikibase-labelview-text',
- $entityId: '.wikibase-labelview-entityid'
+ $text: '.wikibase-labelview-text'
},
value: null,
inputNodeName: 'TEXTAREA',
helpMessage: mw.msg( 'wikibase-label-input-help-message' ),
- entityId: null,
showEntityId: false
},
@@ -53,7 +48,6 @@
_create: function() {
if(
!( this.options.value instanceof wb.datamodel.Term )
- || !this.options.entityId
|| !this.options.labelsChanger
|| this.options.inputNodeName !== 'INPUT' &&
this.options.inputNodeName !== 'TEXTAREA'
) {
@@ -116,13 +110,7 @@
labelText = null;
}
- if( this.options.showEntityId && !( this.isInEditMode() &&
labelText ) ) {
- this.$entityId.text( mw.msg( 'parentheses',
this.options.entityId ) );
- } else {
- this.$entityId.empty();
- }
-
- this.element[labelText ? 'removeClass' : 'addClass'](
'wb-empty' );
+ this.element.toggleClass( 'wb-empty', !labelText );
if( !this.isInEditMode() && !labelText ) {
this.$text.text( mw.msg( 'wikibase-label-empty' ) );
diff --git a/view/resources/templates.php b/view/resources/templates.php
index 2cd34fd..96a2ad6 100644
--- a/view/resources/templates.php
+++ b/view/resources/templates.php
@@ -135,8 +135,7 @@
<div class="wikibase-labelview $1" dir="auto">
<div class="wikibase-labelview-container">
<span class="wikibase-labelview-text">$2</span>
- <span class="wikibase-labelview-entityid">$3</span>
- <!-- wikibase-toolbar -->$4
+ <!-- wikibase-toolbar -->$3
</div>
</div>
HTML;
diff --git a/view/src/EntityTermsView.php b/view/src/EntityTermsView.php
index 6537c9f..9bf16f6 100644
--- a/view/src/EntityTermsView.php
+++ b/view/src/EntityTermsView.php
@@ -229,7 +229,6 @@
? $labels->getByLanguage( $languageCode
)->getText()
: $this->msg( 'wikibase-label-empty'
)->text()
),
- '',
''
),
$this->templateFactory->render(
'wikibase-descriptionview',
diff --git
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.aliasesview.tests.js
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.aliasesview.tests.js
index 33199fd..59583de 100644
--- a/view/tests/qunit/jquery/wikibase/jquery.wikibase.aliasesview.tests.js
+++ b/view/tests/qunit/jquery/wikibase/jquery.wikibase.aliasesview.tests.js
@@ -12,7 +12,6 @@
*/
var createAliasesview = function( options ) {
options = $.extend( {
- entityId: 'I am an EntityId',
aliasesChanger: 'I am an AliasesChanger',
value: new wb.datamodel.MultiTerm( 'en', ['a', 'b', 'c'] )
}, options || {} );
diff --git
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.tests.js
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.tests.js
index a18ab37..499d0a5 100644
---
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.tests.js
+++
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.tests.js
@@ -11,7 +11,6 @@
*/
var createEntitytermsforlanguagelistview = function( options ) {
options = $.extend( {
- entityId: 'I am an EntityId',
entityChangersFactory: {
getAliasesChanger: function() { return 'I am an
AliasesChanger'; },
getDescriptionsChanger: function() { return 'I am a
DescriptionsChanger'; },
diff --git
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.tests.js
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.tests.js
index 047dc55..51a4127 100644
---
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.tests.js
+++
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.tests.js
@@ -12,7 +12,6 @@
*/
var createEntitytermsforlanguageview = function( options, $node ) {
options = $.extend( {
- entityId: 'I am an EntityId',
entityChangersFactory: {
getAliasesChanger: function() { return 'I am an
AliasesChanger'; },
getDescriptionsChanger: function() {
diff --git
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsview.tests.js
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsview.tests.js
index 3aea723..bc6a08d 100644
--- a/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsview.tests.js
+++ b/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsview.tests.js
@@ -24,7 +24,6 @@
aliases: new wb.datamodel.MultiTerm( 'en', [] )
}
],
- entityId: 'I am an EntityId',
entityChangersFactory: {
getAliasesChanger: function() { return 'I am an
AliasesChanger'; },
getDescriptionsChanger: function() { return 'I am a
DescriptionsChanger'; },
diff --git
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.labelview.tests.js
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.labelview.tests.js
index 0b3cf33..bdf161e 100644
--- a/view/tests/qunit/jquery/wikibase/jquery.wikibase.labelview.tests.js
+++ b/view/tests/qunit/jquery/wikibase/jquery.wikibase.labelview.tests.js
@@ -12,7 +12,6 @@
*/
var createLabelview = function( options, $node ) {
options = $.extend( {
- entityId: 'I am an EntityId',
labelsChanger: 'I am a LabelsChanger',
value: new wb.datamodel.Term( 'en', 'test label' )
}, options || {} );
--
To view, visit https://gerrit.wikimedia.org/r/242501
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb40159bfcd1249a19d1d2bec058d5618419cf3f
Gerrit-PatchSet: 1
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
