Bene has uploaded a new change for review. https://gerrit.wikimedia.org/r/276472
Change subject: Update Wikibase: Backport of sitelinks related bug fixes ...................................................................... Update Wikibase: Backport of sitelinks related bug fixes https://gerrit.wikimedia.org/r/#/c/276425/ https://gerrit.wikimedia.org/r/#/c/276448/ Change-Id: Id8ef3aeb44701c3048936fda2646fe973f1fb2eb --- M composer.lock M extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js M extensions/Wikibase/view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinklistview.css M extensions/Wikibase/view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinklistview.tests.js M vendor/composer/installed.json 5 files changed, 110 insertions(+), 96 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/72/276472/1 diff --git a/composer.lock b/composer.lock index 37ccac7..d1e4f71 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": "13c2359ceb9af636e0a238fb297fc870", + "hash": "866ab2c727288cc7640585653d483dea", "content-hash": "1cb40c7dc8b165501dd073ab04fb0b35", "packages": [ { @@ -1445,12 +1445,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";, - "reference": "37483ea3f7a7f15e3e99162429fc3c6ebdf2092f" + "reference": "72aa266953a542298b68b3e5df47a7b633512957" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/37483ea3f7a7f15e3e99162429fc3c6ebdf2092f";, - "reference": "37483ea3f7a7f15e3e99162429fc3c6ebdf2092f", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/72aa266953a542298b68b3e5df47a7b633512957";, + "reference": "72aa266953a542298b68b3e5df47a7b633512957", "shasum": "" }, "require": { @@ -1522,7 +1522,7 @@ "wikibaserepo", "wikidata" ], - "time": "2016-03-07 21:27:54" + "time": "2016-03-10 14:55:14" }, { "name": "wikibase/wikimedia-badges", diff --git a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js index a17df74..95b0a6b 100644 --- a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js +++ b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js @@ -362,10 +362,15 @@ isInitialValue: function() { var listview = this.$listview.data( 'listview' ), lia = listview.listItemAdapter(), + $nonEmptyItems = listview.nonEmptyItems(), isInitialValue = true; + if ( $nonEmptyItems.length !== this.options.value.length ) { + return false; + } + // Ignore empty values. - listview.nonEmptyItems().each( function() { + $nonEmptyItems.each( function() { var sitelinkview = lia.liInstance( $( this ) ); isInitialValue = sitelinkview.isInitialValue(); return isInitialValue; diff --git a/extensions/Wikibase/view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinklistview.css b/extensions/Wikibase/view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinklistview.css index 4286762..7846f4a 100644 --- a/extensions/Wikibase/view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinklistview.css +++ b/extensions/Wikibase/view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinklistview.css @@ -42,6 +42,7 @@ display: table-cell; padding-left: 0.4em; vertical-align: middle; + word-break: break-all; /* Break in Firefox if no hyphenation data is available */ } .wikibase-sitelinklistview .wikibase-sitelinkview .wikibase-sitelinkview-link .wikibase-sitelinkview-page { diff --git a/extensions/Wikibase/view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinklistview.tests.js b/extensions/Wikibase/view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinklistview.tests.js index 823e204..ed166f7 100644 --- a/extensions/Wikibase/view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinklistview.tests.js +++ b/extensions/Wikibase/view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinklistview.tests.js @@ -179,7 +179,7 @@ } ); QUnit.test( 'isInitialValue()', function( assert ) { - assert.expect( 3 ); + assert.expect( 4 ); var $sitelinklistview = createSitelinklistview( { value: [new wb.datamodel.SiteLink( 'enwiki', 'enwiki-page' )] } ), @@ -193,9 +193,9 @@ var $sitelinkview = listview.addItem( new wb.datamodel.SiteLink( 'aawiki', 'aawiki-page' ) ); - assert.ok( + assert.notOk( sitelinklistview.isInitialValue(), - 'Verified isInitialValue() still returning false after adding another unchanged value' + 'FALSE after adding another site link' ); listview.removeItem( $sitelinkview ); @@ -204,6 +204,14 @@ sitelinklistview.isInitialValue(), 'TRUE after resetting to initial value.' ); + + var items = listview.items(); + listview.removeItem( $( items[0] ) ); + + assert.notOk( + sitelinklistview.isInitialValue(), + 'FALSE after removing one of the original site link values' + ); } ); QUnit.test( 'startEditing() & stopEditing()', 4, function( assert ) { diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 8615cd7..6b4cfaf 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1318,93 +1318,6 @@ ] }, { - "name": "wikibase/wikibase", - "version": "dev-wmf/1.27.0-wmf.16", - "version_normalized": "dev-wmf/1.27.0-wmf.16", - "source": { - "type": "git", - "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";, - "reference": "37483ea3f7a7f15e3e99162429fc3c6ebdf2092f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/37483ea3f7a7f15e3e99162429fc3c6ebdf2092f";, - "reference": "37483ea3f7a7f15e3e99162429fc3c6ebdf2092f", - "shasum": "" - }, - "require": { - "data-values/common": "~0.3.0", - "data-values/data-types": "~0.5.0", - "data-values/data-values": "~1.0", - "data-values/geo": "~1.0", - "data-values/interfaces": "~0.2.0|~0.1.5", - "data-values/javascript": "~0.8.0", - "data-values/number": "~0.6.0", - "data-values/serialization": "~1.0", - "data-values/time": "~0.8.2", - "data-values/validators": "~0.1.0", - "data-values/value-view": "~0.16.1", - "diff/diff": "~2.0", - "php": ">=5.5.0", - "wikibase/data-model": "~5.0.2", - "wikibase/data-model-javascript": "~2.0.0", - "wikibase/data-model-serialization": "~2.0", - "wikibase/data-model-services": "~3.4", - "wikibase/internal-serialization": "~2.0", - "wikibase/javascript-api": "~1.1", - "wikibase/serialization-javascript": "~2.0.5" - }, - "conflict": { - "mediawiki/mediawiki": "<1.25" - }, - "require-dev": { - "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0" - }, - "time": "2016-03-07 21:27:54", - "type": "mediawiki-extension", - "installation-source": "dist", - "autoload": { - "classmap": [ - "client/includes/", - "client/WikibaseClient.hooks.php", - "client/tests/phpunit/", - "lib/includes/", - "lib/WikibaseLib.hooks.php", - "lib/maintenance/", - "lib/tests/phpunit/", - "repo/includes/", - "repo/maintenance/", - "repo/tests/phpunit/", - "repo/Wikibase.hooks.php" - ], - "psr-4": { - "Wikibase\\View\\": "view/src", - "Wikibase\\View\\Tests\\": "view/tests/phpunit", - "Wikimedia\\Purtle\\": "purtle/src", - "Wikimedia\\Purtle\\Tests\\": "purtle/tests/phpunit" - } - }, - "notification-url": "https://packagist.org/downloads/";, - "license": [ - "GPL-2.0+" - ], - "authors": [ - { - "name": "The Wikidata team" - } - ], - "description": "Structured data repository for MediaWiki", - "homepage": "http://wikiba.se";, - "keywords": [ - "wikibase", - "wikibaseclient", - "wikibaselib", - "wikibaserepo", - "wikidata" - ] - }, - { "name": "wikibase/wikimedia-badges", "version": "dev-master", "version_normalized": "9999999-dev", @@ -1613,5 +1526,92 @@ "support": { "issues": "https://phabricator.wikimedia.org/project/profile/1202/"; } + }, + { + "name": "wikibase/wikibase", + "version": "dev-wmf/1.27.0-wmf.16", + "version_normalized": "dev-wmf/1.27.0-wmf.16", + "source": { + "type": "git", + "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";, + "reference": "72aa266953a542298b68b3e5df47a7b633512957" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/72aa266953a542298b68b3e5df47a7b633512957";, + "reference": "72aa266953a542298b68b3e5df47a7b633512957", + "shasum": "" + }, + "require": { + "data-values/common": "~0.3.0", + "data-values/data-types": "~0.5.0", + "data-values/data-values": "~1.0", + "data-values/geo": "~1.0", + "data-values/interfaces": "~0.2.0|~0.1.5", + "data-values/javascript": "~0.8.0", + "data-values/number": "~0.6.0", + "data-values/serialization": "~1.0", + "data-values/time": "~0.8.2", + "data-values/validators": "~0.1.0", + "data-values/value-view": "~0.16.1", + "diff/diff": "~2.0", + "php": ">=5.5.0", + "wikibase/data-model": "~5.0.2", + "wikibase/data-model-javascript": "~2.0.0", + "wikibase/data-model-serialization": "~2.0", + "wikibase/data-model-services": "~3.4", + "wikibase/internal-serialization": "~2.0", + "wikibase/javascript-api": "~1.1", + "wikibase/serialization-javascript": "~2.0.5" + }, + "conflict": { + "mediawiki/mediawiki": "<1.25" + }, + "require-dev": { + "jakub-onderka/php-parallel-lint": "0.9.2", + "mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0" + }, + "time": "2016-03-10 14:55:14", + "type": "mediawiki-extension", + "installation-source": "dist", + "autoload": { + "classmap": [ + "client/includes/", + "client/WikibaseClient.hooks.php", + "client/tests/phpunit/", + "lib/includes/", + "lib/WikibaseLib.hooks.php", + "lib/maintenance/", + "lib/tests/phpunit/", + "repo/includes/", + "repo/maintenance/", + "repo/tests/phpunit/", + "repo/Wikibase.hooks.php" + ], + "psr-4": { + "Wikibase\\View\\": "view/src", + "Wikibase\\View\\Tests\\": "view/tests/phpunit", + "Wikimedia\\Purtle\\": "purtle/src", + "Wikimedia\\Purtle\\Tests\\": "purtle/tests/phpunit" + } + }, + "notification-url": "https://packagist.org/downloads/";, + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "The Wikidata team" + } + ], + "description": "Structured data repository for MediaWiki", + "homepage": "http://wikiba.se";, + "keywords": [ + "wikibase", + "wikibaseclient", + "wikibaselib", + "wikibaserepo", + "wikidata" + ] } ] -- To view, visit https://gerrit.wikimedia.org/r/276472 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8ef3aeb44701c3048936fda2646fe973f1fb2eb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: wmf/1.27.0-wmf.6 Gerrit-Owner: Bene <benestar.wikime...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
