WikidataBuilder has uploaded a new change for review. https://gerrit.wikimedia.org/r/268403
Change subject: New Wikidata Build - 2016-02-04T15:48:26+0000 ...................................................................... New Wikidata Build - 2016-02-04T15:48:26+0000 Change-Id: I0fba9509b41a4eb940c7e4765805d3a10ba50607 --- D .gitreview M README.md M composer.lock M extensions/Wikibase/lib/tests/qunit/data/testrunner.js M extensions/Wikibase/repo/includes/api/CreateClaim.php M extensions/Wikibase/repo/includes/api/ModifyClaim.php M extensions/Wikibase/repo/includes/api/RemoveClaims.php M extensions/Wikibase/repo/includes/api/RemoveQualifiers.php M extensions/Wikibase/repo/includes/api/RemoveReferences.php M extensions/Wikibase/repo/includes/api/SetClaim.php M extensions/Wikibase/repo/includes/api/SetClaimValue.php M extensions/Wikibase/repo/includes/api/SetQualifier.php M extensions/Wikibase/repo/includes/api/SetReference.php M extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js M extensions/Wikibase/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.tests.js M package.json M vendor/composer/installed.json 17 files changed, 170 insertions(+), 132 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/03/268403/1 diff --git a/.gitreview b/.gitreview deleted file mode 100644 index a165c57..0000000 --- a/.gitreview +++ /dev/null @@ -1,6 +0,0 @@ -[gerrit] -host=gerrit.wikimedia.org -port=29418 -project=mediawiki/extensions/Wikidata.git -defaultbranch=master -defaultrebase=0 diff --git a/README.md b/README.md index 6dd5519..b1ac126 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Wikidata is using a build with Wikibase and its dependencies packaged into one git repo. -If you update the master branch of this repo it will likely be overwritten in the next 24 hours. To change things please see [here](https://github.com/wmde/WikidataBuildResources). +If you update the master branch of this repo it will likely be overwritten in the next 24 hours. To change things please instead make changes to wikidata/build-resources which is used for automated Wikidata builds. (see [here](https://phabricator.wikimedia.org/diffusion/WDBR/)). ## Installation @@ -90,4 +90,4 @@ ## Updating this README -This readme is located [here](https://github.com/wmde/WikidataBuildResources/blob/master/README.md). Any changes made to the README in the Wikidata build repo will be overwritten by this file daily. +This readme is located [here](https://phabricator.wikimedia.org/diffusion/WDBR/browse/master/README.md). Any changes made to the README in the Wikidata build repo will be overwritten by this file daily. diff --git a/composer.lock b/composer.lock index 106ee1a..932d88c 100644 --- a/composer.lock +++ b/composer.lock @@ -1449,12 +1449,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";, - "reference": "abed9c13723b30a32645b12d9ca8d51f7bace162" + "reference": "5e6c0a3a475cf0b44aa1de4cffd3558135b750b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/abed9c13723b30a32645b12d9ca8d51f7bace162";, - "reference": "abed9c13723b30a32645b12d9ca8d51f7bace162", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/5e6c0a3a475cf0b44aa1de4cffd3558135b750b2";, + "reference": "5e6c0a3a475cf0b44aa1de4cffd3558135b750b2", "shasum": "" }, "require": { @@ -1525,7 +1525,7 @@ "wikibaserepo", "wikidata" ], - "time": "2016-02-03 22:10:05" + "time": "2016-02-04 10:42:04" }, { "name": "wikibase/wikimedia-badges", diff --git a/extensions/Wikibase/lib/tests/qunit/data/testrunner.js b/extensions/Wikibase/lib/tests/qunit/data/testrunner.js index 5ae1d59..8c042bc 100644 --- a/extensions/Wikibase/lib/tests/qunit/data/testrunner.js +++ b/extensions/Wikibase/lib/tests/qunit/data/testrunner.js @@ -7,8 +7,6 @@ ( function ( $, mw, wb, QUnit ) { 'use strict'; - QUnit.config.testTimeout = 5000; - /** * Reset basic configuration for each test(); Makes sure that global configuration stuff and * cached stuff will be reset before each test. Also allows to set additional 'setup' and diff --git a/extensions/Wikibase/repo/includes/api/CreateClaim.php b/extensions/Wikibase/repo/includes/api/CreateClaim.php index 99676f9..09044f4 100644 --- a/extensions/Wikibase/repo/includes/api/CreateClaim.php +++ b/extensions/Wikibase/repo/includes/api/CreateClaim.php @@ -57,9 +57,12 @@ $entityId = $this->modificationHelper->getEntityIdFromString( $params['entity'] ); if ( isset( $params['baserevid'] ) ) { - $entityRevision = $this->loadEntityRevision( $entityId, (int)$params['baserevid'] ); + $entityRevision = $this->entityLoadingHelper->loadEntityRevision( + $entityId, + (int)$params['baserevid'] + ); } else { - $entityRevision = $this->loadEntityRevision( $entityId ); + $entityRevision = $this->entityLoadingHelper->loadEntityRevision( $entityId ); } $entity = $entityRevision->getEntity(); @@ -82,10 +85,10 @@ $statement = $entity->getStatements()->getFirstStatementWithGuid( $changeOp->getStatementGuid() ); - $status = $this->attemptSaveEntity( $entity, $summary, EDIT_UPDATE ); - $this->getResultBuilder()->addRevisionIdFromStatusToResult( $status, 'pageinfo' ); - $this->getResultBuilder()->markSuccess(); - $this->getResultBuilder()->addStatement( $statement ); + $status = $this->entitySavingHelper->attemptSaveEntity( $entity, $summary, EDIT_UPDATE ); + $this->resultBuilder->addRevisionIdFromStatusToResult( $status, 'pageinfo' ); + $this->resultBuilder->markSuccess(); + $this->resultBuilder->addStatement( $statement ); } /** @@ -159,6 +162,14 @@ self::PARAM_TYPE => 'text', self::PARAM_REQUIRED => false, ), + 'summary' => array( + self::PARAM_TYPE => 'string', + ), + 'token' => null, + 'baserevid' => array( + self::PARAM_TYPE => 'integer', + ), + 'bot' => false, ), parent::getAllowedParams() ); diff --git a/extensions/Wikibase/repo/includes/api/ModifyClaim.php b/extensions/Wikibase/repo/includes/api/ModifyClaim.php index 374fd33..e5c057a 100644 --- a/extensions/Wikibase/repo/includes/api/ModifyClaim.php +++ b/extensions/Wikibase/repo/includes/api/ModifyClaim.php @@ -4,13 +4,10 @@ use ApiBase; use ApiMain; -use Status; use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Services\Statement\StatementGuidParser; -use Wikibase\Lib\Store\EntityRevisionLookup; use Wikibase\Repo\WikibaseRepo; -use Wikibase\Summary; /** * Base class for modifying claims. @@ -40,17 +37,17 @@ /** * @var ResultBuilder */ - private $resultBuilder; + protected $resultBuilder; /** * @var EntityLoadingHelper */ - private $entityLoadingHelper; + protected $entityLoadingHelper; /** * @var EntitySavingHelper */ - private $entitySavingHelper; + protected $entitySavingHelper; /** * @param ApiMain $mainModule @@ -76,49 +73,6 @@ $this->resultBuilder = $apiHelperFactory->getResultBuilder( $this ); $this->entityLoadingHelper = $apiHelperFactory->getEntityLoadingHelper( $this ); $this->entitySavingHelper = $apiHelperFactory->getEntitySavingHelper( $this ); - } - - /** - * @see EntitySavingHelper::attemptSaveEntity - */ - protected function attemptSaveEntity( Entity $entity, $summary, $flags = 0 ) { - return $this->entitySavingHelper->attemptSaveEntity( $entity, $summary, $flags ); - } - - /** - * @return ResultBuilder - */ - protected function getResultBuilder() { - return $this->resultBuilder; - } - - /** - * @see EntitySavingHelper::loadEntityRevision - */ - protected function loadEntityRevision( - EntityId $entityId, - $revId = EntityRevisionLookup::LATEST_FROM_MASTER - ) { - return $this->entityLoadingHelper->loadEntityRevision( $entityId, $revId ); - } - - /** - * @see ApiBase::getAllowedParams - */ - protected function getAllowedParams() { - return array_merge( - parent::getAllowedParams(), - array( - 'summary' => array( - self::PARAM_TYPE => 'string', - ), - 'token' => null, - 'baserevid' => array( - self::PARAM_TYPE => 'integer', - ), - 'bot' => false, - ) - ); } } diff --git a/extensions/Wikibase/repo/includes/api/RemoveClaims.php b/extensions/Wikibase/repo/includes/api/RemoveClaims.php index a820a20..c50815b 100644 --- a/extensions/Wikibase/repo/includes/api/RemoveClaims.php +++ b/extensions/Wikibase/repo/includes/api/RemoveClaims.php @@ -59,9 +59,12 @@ $params = $this->extractRequestParams(); $entityId = $this->getEntityId( $params ); if ( isset( $params['baserevid'] ) ) { - $entityRevision = $this->loadEntityRevision( $entityId, (int)$params['baserevid'] ); + $entityRevision = $this->entityLoadingHelper->loadEntityRevision( + $entityId, + (int)$params['baserevid'] + ); } else { - $entityRevision = $this->loadEntityRevision( $entityId ); + $entityRevision = $this->entityLoadingHelper->loadEntityRevision( $entityId ); } $entity = $entityRevision->getEntity(); @@ -80,10 +83,10 @@ $this->errorReporter->dieException( $e, 'failed-save' ); } - $status = $this->attemptSaveEntity( $entity, $summary, EDIT_UPDATE ); - $this->getResultBuilder()->addRevisionIdFromStatusToResult( $status, 'pageinfo' ); - $this->getResultBuilder()->markSuccess(); - $this->getResultBuilder()->setList( null, 'claims', $params['claim'], 'claim' ); + $status = $this->entitySavingHelper->attemptSaveEntity( $entity, $summary, EDIT_UPDATE ); + $this->resultBuilder->addRevisionIdFromStatusToResult( $status, 'pageinfo' ); + $this->resultBuilder->markSuccess(); + $this->resultBuilder->setList( null, 'claims', $params['claim'], 'claim' ); } /** @@ -184,6 +187,14 @@ self::PARAM_ISMULTI => true, self::PARAM_REQUIRED => true, ), + 'summary' => array( + self::PARAM_TYPE => 'string', + ), + 'token' => null, + 'baserevid' => array( + self::PARAM_TYPE => 'integer', + ), + 'bot' => false, ), parent::getAllowedParams() ); diff --git a/extensions/Wikibase/repo/includes/api/RemoveQualifiers.php b/extensions/Wikibase/repo/includes/api/RemoveQualifiers.php index e639fbc..1f67c66 100644 --- a/extensions/Wikibase/repo/includes/api/RemoveQualifiers.php +++ b/extensions/Wikibase/repo/includes/api/RemoveQualifiers.php @@ -59,9 +59,12 @@ $guid = $params['claim']; $entityId = $this->guidParser->parse( $guid )->getEntityId(); if ( isset( $params['baserevid'] ) ) { - $entityRevision = $this->loadEntityRevision( $entityId, (int)$params['baserevid'] ); + $entityRevision = $this->entityLoadingHelper->loadEntityRevision( + $entityId, + (int)$params['baserevid'] + ); } else { - $entityRevision = $this->loadEntityRevision( $entityId ); + $entityRevision = $this->entityLoadingHelper->loadEntityRevision( $entityId ); } $entity = $entityRevision->getEntity(); $summary = $this->modificationHelper->createSummary( $params, $this ); @@ -79,9 +82,9 @@ $this->errorReporter->dieException( $e, 'failed-save' ); } - $status = $this->attemptSaveEntity( $entity, $summary, EDIT_UPDATE ); - $this->getResultBuilder()->addRevisionIdFromStatusToResult( $status, 'pageinfo' ); - $this->getResultBuilder()->markSuccess(); + $status = $this->entitySavingHelper->attemptSaveEntity( $entity, $summary, EDIT_UPDATE ); + $this->resultBuilder->addRevisionIdFromStatusToResult( $status, 'pageinfo' ); + $this->resultBuilder->markSuccess(); } /** @@ -160,6 +163,14 @@ self::PARAM_REQUIRED => true, self::PARAM_ISMULTI => true, ), + 'summary' => array( + self::PARAM_TYPE => 'string', + ), + 'token' => null, + 'baserevid' => array( + self::PARAM_TYPE => 'integer', + ), + 'bot' => false, ), parent::getAllowedParams() ); diff --git a/extensions/Wikibase/repo/includes/api/RemoveReferences.php b/extensions/Wikibase/repo/includes/api/RemoveReferences.php index 6602f1e..1a8658e 100644 --- a/extensions/Wikibase/repo/includes/api/RemoveReferences.php +++ b/extensions/Wikibase/repo/includes/api/RemoveReferences.php @@ -59,9 +59,12 @@ $guid = $params['statement']; $entityId = $this->guidParser->parse( $guid )->getEntityId(); if ( isset( $params['baserevid'] ) ) { - $entityRevision = $this->loadEntityRevision( $entityId, (int)$params['baserevid'] ); + $entityRevision = $this->entityLoadingHelper->loadEntityRevision( + $entityId, + (int)$params['baserevid'] + ); } else { - $entityRevision = $this->loadEntityRevision( $entityId ); + $entityRevision = $this->entityLoadingHelper->loadEntityRevision( $entityId ); } $entity = $entityRevision->getEntity(); $summary = $this->modificationHelper->createSummary( $params, $this ); @@ -86,9 +89,9 @@ $this->errorReporter->dieException( $e, 'failed-save' ); } - $status = $this->attemptSaveEntity( $entity, $summary, EDIT_UPDATE ); - $this->getResultBuilder()->addRevisionIdFromStatusToResult( $status, 'pageinfo' ); - $this->getResultBuilder()->markSuccess(); + $status = $this->entitySavingHelper->attemptSaveEntity( $entity, $summary, EDIT_UPDATE ); + $this->resultBuilder->addRevisionIdFromStatusToResult( $status, 'pageinfo' ); + $this->resultBuilder->markSuccess(); } /** @@ -167,6 +170,14 @@ self::PARAM_REQUIRED => true, self::PARAM_ISMULTI => true, ), + 'summary' => array( + self::PARAM_TYPE => 'string', + ), + 'token' => null, + 'baserevid' => array( + self::PARAM_TYPE => 'integer', + ), + 'bot' => false, ), parent::getAllowedParams() ); diff --git a/extensions/Wikibase/repo/includes/api/SetClaim.php b/extensions/Wikibase/repo/includes/api/SetClaim.php index 4d21856..d665d8b 100644 --- a/extensions/Wikibase/repo/includes/api/SetClaim.php +++ b/extensions/Wikibase/repo/includes/api/SetClaim.php @@ -86,9 +86,12 @@ $entityId = $claimGuid->getEntityId(); if ( isset( $params['baserevid'] ) ) { - $entityRevision = $this->loadEntityRevision( $entityId, (int)$params['baserevid'] ); + $entityRevision = $this->entityLoadingHelper->loadEntityRevision( + $entityId, + (int)$params['baserevid'] + ); } else { - $entityRevision = $this->loadEntityRevision( $entityId ); + $entityRevision = $this->entityLoadingHelper->loadEntityRevision( $entityId ); } $entity = $entityRevision->getEntity(); @@ -101,10 +104,10 @@ $this->modificationHelper->applyChangeOp( $changeop, $entity, $summary ); - $status = $this->attemptSaveEntity( $entity, $summary, EDIT_UPDATE ); - $this->getResultBuilder()->addRevisionIdFromStatusToResult( $status, 'pageinfo' ); - $this->getResultBuilder()->markSuccess(); - $this->getResultBuilder()->addStatement( $claim ); + $status = $this->entitySavingHelper->attemptSaveEntity( $entity, $summary, EDIT_UPDATE ); + $this->resultBuilder->addRevisionIdFromStatusToResult( $status, 'pageinfo' ); + $this->resultBuilder->markSuccess(); + $this->resultBuilder->addStatement( $claim ); } /** @@ -204,6 +207,14 @@ 'index' => array( self::PARAM_TYPE => 'integer', ), + 'summary' => array( + self::PARAM_TYPE => 'string', + ), + 'token' => null, + 'baserevid' => array( + self::PARAM_TYPE => 'integer', + ), + 'bot' => false, ), parent::getAllowedParams() ); diff --git a/extensions/Wikibase/repo/includes/api/SetClaimValue.php b/extensions/Wikibase/repo/includes/api/SetClaimValue.php index 7a70f44..f50e9e0 100644 --- a/extensions/Wikibase/repo/includes/api/SetClaimValue.php +++ b/extensions/Wikibase/repo/includes/api/SetClaimValue.php @@ -57,9 +57,12 @@ $guid = $params['claim']; $entityId = $this->guidParser->parse( $guid )->getEntityId(); if ( isset( $params['baserevid'] ) ) { - $entityRevision = $this->loadEntityRevision( $entityId, (int)$params['baserevid'] ); + $entityRevision = $this->entityLoadingHelper->loadEntityRevision( + $entityId, + (int)$params['baserevid'] + ); } else { - $entityRevision = $this->loadEntityRevision( $entityId ); + $entityRevision = $this->entityLoadingHelper->loadEntityRevision( $entityId ); } $entity = $entityRevision->getEntity(); @@ -73,10 +76,10 @@ $this->modificationHelper->applyChangeOp( $changeOp, $entity, $summary ); - $status = $this->attemptSaveEntity( $entity, $summary, EDIT_UPDATE ); - $this->getResultBuilder()->addRevisionIdFromStatusToResult( $status, 'pageinfo' ); - $this->getResultBuilder()->markSuccess(); - $this->getResultBuilder()->addStatement( $claim ); + $status = $this->entitySavingHelper->attemptSaveEntity( $entity, $summary, EDIT_UPDATE ); + $this->resultBuilder->addRevisionIdFromStatusToResult( $status, 'pageinfo' ); + $this->resultBuilder->markSuccess(); + $this->resultBuilder->addStatement( $claim ); } /** @@ -122,6 +125,14 @@ self::PARAM_TYPE => array( 'value', 'novalue', 'somevalue' ), self::PARAM_REQUIRED => true, ), + 'summary' => array( + self::PARAM_TYPE => 'string', + ), + 'token' => null, + 'baserevid' => array( + self::PARAM_TYPE => 'integer', + ), + 'bot' => false, ), parent::getAllowedParams() ); diff --git a/extensions/Wikibase/repo/includes/api/SetQualifier.php b/extensions/Wikibase/repo/includes/api/SetQualifier.php index ef6cf06..74a8637 100644 --- a/extensions/Wikibase/repo/includes/api/SetQualifier.php +++ b/extensions/Wikibase/repo/includes/api/SetQualifier.php @@ -58,9 +58,12 @@ $entityId = $this->guidParser->parse( $params['claim'] )->getEntityId(); if ( isset( $params['baserevid'] ) ) { - $entityRevision = $this->loadEntityRevision( $entityId, (int)$params['baserevid'] ); + $entityRevision = $this->entityLoadingHelper->loadEntityRevision( + $entityId, + (int)$params['baserevid'] + ); } else { - $entityRevision = $this->loadEntityRevision( $entityId ); + $entityRevision = $this->entityLoadingHelper->loadEntityRevision( $entityId ); } $entity = $entityRevision->getEntity(); @@ -75,10 +78,10 @@ $changeOp = $this->getChangeOp(); $this->modificationHelper->applyChangeOp( $changeOp, $entity, $summary ); - $status = $this->attemptSaveEntity( $entity, $summary, EDIT_UPDATE ); - $this->getResultBuilder()->addRevisionIdFromStatusToResult( $status, 'pageinfo' ); - $this->getResultBuilder()->markSuccess(); - $this->getResultBuilder()->addStatement( $statement ); + $status = $this->entitySavingHelper->attemptSaveEntity( $entity, $summary, EDIT_UPDATE ); + $this->resultBuilder->addRevisionIdFromStatusToResult( $status, 'pageinfo' ); + $this->resultBuilder->markSuccess(); + $this->resultBuilder->addStatement( $statement ); } /** @@ -192,6 +195,14 @@ self::PARAM_TYPE => 'string', self::PARAM_REQUIRED => false, ), + 'summary' => array( + self::PARAM_TYPE => 'string', + ), + 'token' => null, + 'baserevid' => array( + self::PARAM_TYPE => 'integer', + ), + 'bot' => false, ), parent::getAllowedParams() ); diff --git a/extensions/Wikibase/repo/includes/api/SetReference.php b/extensions/Wikibase/repo/includes/api/SetReference.php index c8fa0f9..8c03196 100644 --- a/extensions/Wikibase/repo/includes/api/SetReference.php +++ b/extensions/Wikibase/repo/includes/api/SetReference.php @@ -69,9 +69,12 @@ $entityId = $this->guidParser->parse( $params['statement'] )->getEntityId(); if ( isset( $params['baserevid'] ) ) { - $entityRevision = $this->loadEntityRevision( $entityId, (int)$params['baserevid'] ); + $entityRevision = $this->entityLoadingHelper->loadEntityRevision( + $entityId, + (int)$params['baserevid'] + ); } else { - $entityRevision = $this->loadEntityRevision( $entityId ); + $entityRevision = $this->entityLoadingHelper->loadEntityRevision( $entityId ); } $entity = $entityRevision->getEntity(); @@ -106,11 +109,10 @@ $changeOp = $this->getChangeOp( $newReference ); $this->modificationHelper->applyChangeOp( $changeOp, $entity, $summary ); - $status = $this->attemptSaveEntity( $entity, $summary, EDIT_UPDATE ); - $resultBuilder = $this->getResultBuilder(); - $resultBuilder->addRevisionIdFromStatusToResult( $status, 'pageinfo' ); - $resultBuilder->markSuccess(); - $resultBuilder->addReference( $newReference ); + $status = $this->entitySavingHelper->attemptSaveEntity( $entity, $summary, EDIT_UPDATE ); + $this->resultBuilder->addRevisionIdFromStatusToResult( $status, 'pageinfo' ); + $this->resultBuilder->markSuccess(); + $this->resultBuilder->addReference( $newReference ); } /** @@ -208,6 +210,14 @@ 'index' => array( self::PARAM_TYPE => 'integer', ), + 'summary' => array( + self::PARAM_TYPE => 'string', + ), + 'token' => null, + 'baserevid' => array( + self::PARAM_TYPE => 'integer', + ), + 'bot' => false, ), parent::getAllowedParams() ); diff --git a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js index 4ba72b8..4e68f57 100644 --- a/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js +++ b/extensions/Wikibase/view/resources/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.js @@ -226,7 +226,7 @@ * @private */ _createEntitytermsforlanguagelistviewMore: function() { - if ( !this._hasAdditionalLanguages() ) { + if ( !this._hasMoreLanguages() ) { return; } @@ -243,11 +243,10 @@ }, /** - * Checks whether there are more languages to display. - * + * @return {boolean} If there are more languages to display. * @private */ - _hasAdditionalLanguages: function() { + _hasMoreLanguages: function() { var fingerprint = this.options.value, minLength = this.options.userLanguages.length; @@ -258,7 +257,7 @@ return true; } - return this._getAdditionalLanguages().length > 0; + return !$.isEmptyObject( this._getMoreLanguages() ); }, /** @@ -295,12 +294,16 @@ ) ); }, + /** + * @return {boolean} + * @private + */ _isMoreLanguagesExpanded: function() { return !$.isEmptyObject( this._moreLanguagesItems ); }, /** - * Add 'more' languages to listview + * Add terms in "more" languages to the list view, ordered by language code. * * @private */ @@ -309,7 +312,7 @@ lia = listview.listItemAdapter(), self = this; - $.each( this._getAdditionalLanguages(), function() { + $.each( Object.keys( this._getMoreLanguages() ).sort(), function() { var $item = listview.addItem( self._getValueForLanguage( this ) ); if ( self._isInEditMode ) { lia.liInstance( $item ).startEditing(); @@ -319,7 +322,7 @@ }, /** - * Remove 'more' languages from listview + * Remove terms in "more" languages from the list view. * * @private */ @@ -334,10 +337,10 @@ }, /** - * @return {Object} List of additional language codes in this fingerprint. + * @return {Object} Unsorted map of "more" language codes in this fingerprint. * @private */ - _getAdditionalLanguages: function() { + _getMoreLanguages: function() { var fingerprint = this.options.value, languages = {}; @@ -355,7 +358,7 @@ delete languages[this]; } ); - return Object.keys( languages ).sort(); + return languages; }, /** diff --git a/extensions/Wikibase/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.tests.js b/extensions/Wikibase/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.tests.js index b103965..fa43eb7 100644 --- a/extensions/Wikibase/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.tests.js +++ b/extensions/Wikibase/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguagelistview.tests.js @@ -170,23 +170,25 @@ ); } ); -QUnit.test( '_getAdditionalLanguages()', function( assert ) { +QUnit.test( '_getMoreLanguages()', function( assert ) { assert.expect( 1 ); var $entitytermsforlanguagelistview = createEntitytermsforlanguagelistview(), entitytermsforlanguagelistview = $entitytermsforlanguagelistview.data( 'entitytermsforlanguagelistview' ); - // should be sorted alphabetically, ie. 'fa' before 'it' - assert.deepEqual( entitytermsforlanguagelistview._getAdditionalLanguages(), [ 'fa', 'it', 'nl' ] ); + assert.deepEqual( + entitytermsforlanguagelistview._getMoreLanguages(), + { fa: 'fa', it: 'it', nl: 'nl' } + ); } ); -QUnit.test( '_hasAdditionalLanguages()', function( assert ) { +QUnit.test( '_hasMoreLanguages()', function( assert ) { assert.expect( 2 ); var $entitytermsforlanguagelistview = createEntitytermsforlanguagelistview(), entitytermsforlanguagelistview = $entitytermsforlanguagelistview.data( 'entitytermsforlanguagelistview' ); - assert.ok( entitytermsforlanguagelistview._hasAdditionalLanguages() ); + assert.ok( entitytermsforlanguagelistview._hasMoreLanguages() ); $entitytermsforlanguagelistview = createEntitytermsforlanguagelistview( { userLanguages: [ 'de', 'en', 'fa', 'it', 'nl' ] @@ -194,7 +196,7 @@ entitytermsforlanguagelistview = $entitytermsforlanguagelistview.data( 'entitytermsforlanguagelistview' ); - assert.ok( !entitytermsforlanguagelistview._hasAdditionalLanguages() ); + assert.ok( !entitytermsforlanguagelistview._hasMoreLanguages() ); } ); }( jQuery, wikibase, QUnit ) ); diff --git a/package.json b/package.json index 43aebb1..d67613b 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "repository": { "type": "git", - "url": "https://github.com/wmde/WikidataBuildResources.git"; + "url": "https://gerrit.wikimedia.org/r/wikidata/build-resources"; }, "devDependencies": { "grunt": "~0.4.5", diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 7663e6b..82b9e50 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1237,12 +1237,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";, - "reference": "abed9c13723b30a32645b12d9ca8d51f7bace162" + "reference": "5e6c0a3a475cf0b44aa1de4cffd3558135b750b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/abed9c13723b30a32645b12d9ca8d51f7bace162";, - "reference": "abed9c13723b30a32645b12d9ca8d51f7bace162", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/5e6c0a3a475cf0b44aa1de4cffd3558135b750b2";, + "reference": "5e6c0a3a475cf0b44aa1de4cffd3558135b750b2", "shasum": "" }, "require": { @@ -1274,7 +1274,7 @@ "jakub-onderka/php-parallel-lint": "0.9.2", "mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0" }, - "time": "2016-02-03 22:10:05", + "time": "2016-02-04 10:42:04", "type": "mediawiki-extension", "installation-source": "dist", "autoload": { -- To view, visit https://gerrit.wikimedia.org/r/268403 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0fba9509b41a4eb940c7e4765805d3a10ba50607 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: master Gerrit-Owner: WikidataBuilder <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
