Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/278980
Change subject: Update Wikibase: Fix add qualifier link not getting disabled
......................................................................
Update Wikibase: Fix add qualifier link not getting disabled
Contains I669f81283318f8677708cd82fa52a08c5d31b3d3
Change-Id: I62206d36f4dd20019abbeaff7dd82271d8084d25
---
M composer.lock
M
extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
M vendor/composer/installed.json
3 files changed, 35 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/80/278980/1
diff --git a/composer.lock b/composer.lock
index d1e4f71..45a7080 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
- "hash": "866ab2c727288cc7640585653d483dea",
+ "hash": "13c2359ceb9af636e0a238fb297fc870",
"content-hash": "1cb40c7dc8b165501dd073ab04fb0b35",
"packages": [
{
@@ -782,7 +782,7 @@
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/5998eb87f81bbd7c9be13c7a1a41b7379d71a51f";,
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/525a212dbe3e7bc04922731b92a6c730ba62aeab";,
"reference": "5998eb87f81bbd7c9be13c7a1a41b7379d71a51f",
"shasum": ""
},
@@ -1445,12 +1445,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "72aa266953a542298b68b3e5df47a7b633512957"
+ "reference": "32cac5404ae12464024d95731470ca8ab4e92b31"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/72aa266953a542298b68b3e5df47a7b633512957";,
- "reference": "72aa266953a542298b68b3e5df47a7b633512957",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/32cac5404ae12464024d95731470ca8ab4e92b31";,
+ "reference": "32cac5404ae12464024d95731470ca8ab4e92b31",
"shasum": ""
},
"require": {
@@ -1522,7 +1522,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2016-03-10 14:55:14"
+ "time": "2016-03-22 19:24:14"
},
{
"name": "wikibase/wikimedia-badges",
diff --git
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
index 93e1cae..1e93a12 100644
---
a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
+++
b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
@@ -464,11 +464,17 @@
: wb.datamodel.Statement.RANK.NORMAL
);
this._createMainSnak();
- this._createQualifiersListview(
- this.options.value
- ? this.options.value.getClaim().getQualifiers()
- : new wb.datamodel.SnakList()
- );
+
+ if ( this.isInEditMode()
+ || this.options.value
+ &&
this.options.value.getClaim().getQualifiers().length
+ ) {
+ this._createQualifiersListview(
+ this.options.value
+ ?
this.options.value.getClaim().getQualifiers()
+ : new wb.datamodel.SnakList()
+ );
+ }
this._createReferencesListview(
this.options.value ?
this.options.value.getReferences().toArray() : []
);
@@ -551,12 +557,15 @@
* @return {wikibase.datamodel.SnakList}
*/
_getQualifiers: function() {
- var qualifiers = new wb.datamodel.SnakList(),
- snaklistviews = this._qualifiers.value();
+ var qualifiers = new wb.datamodel.SnakList();
- // Combine qualifiers grouped by property to a single SnakList:
- for ( var i = 0; i < snaklistviews.length; i++ ) {
- qualifiers.merge( snaklistviews[i].value() );
+ if ( this._qualifiers ) {
+ var snaklistviews = this._qualifiers.value();
+
+ // Combine qualifiers grouped by property to a single
SnakList:
+ for ( var i = 0; i < snaklistviews.length; i++ ) {
+ qualifiers.merge( snaklistviews[i].value() );
+ }
}
return qualifiers;
@@ -714,8 +723,10 @@
var qualifiers = this.options.value ?
this.options.value.getClaim().getQualifiers() : [];
- // Refill the qualifier listview with the initial (or new
initial) qualifiers:
- this._createQualifiersListview( qualifiers );
+ if ( qualifiers.length > 0 ) {
+ // Refill the qualifier listview with the initial (or
new initial) qualifiers:
+ this._createQualifiersListview( qualifiers );
+ }
},
/**
@@ -768,7 +779,7 @@
}
return this._mainSnakSnakView.isValid() &&
- this._listViewIsValid( this._qualifiers ) &&
+ ( !this._qualifiers || this._listViewIsValid(
this._qualifiers ) ) &&
this._listViewIsValid( this._referencesListview ) &&
this._instantiateStatement( null ) instanceof
wb.datamodel.Statement;
},
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 6b4cfaf..62beb73 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -110,7 +110,7 @@
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/5998eb87f81bbd7c9be13c7a1a41b7379d71a51f";,
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-ArticlePlaceholder/zipball/525a212dbe3e7bc04922731b92a6c730ba62aeab";,
"reference": "5998eb87f81bbd7c9be13c7a1a41b7379d71a51f",
"shasum": ""
},
@@ -1534,12 +1534,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "72aa266953a542298b68b3e5df47a7b633512957"
+ "reference": "32cac5404ae12464024d95731470ca8ab4e92b31"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/72aa266953a542298b68b3e5df47a7b633512957";,
- "reference": "72aa266953a542298b68b3e5df47a7b633512957",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/32cac5404ae12464024d95731470ca8ab4e92b31";,
+ "reference": "32cac5404ae12464024d95731470ca8ab4e92b31",
"shasum": ""
},
"require": {
@@ -1571,7 +1571,7 @@
"jakub-onderka/php-parallel-lint": "0.9.2",
"mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
},
- "time": "2016-03-10 14:55:14",
+ "time": "2016-03-22 19:24:14",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/278980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I62206d36f4dd20019abbeaff7dd82271d8084d25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.27.0-wmf.16
Gerrit-Owner: Hoo man <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
