Tobias Gritschacher has submitted this change and it was merged.
Change subject: New Wikidata Build - 2014/10/31
......................................................................
New Wikidata Build - 2014/10/31
Change-Id: Iac378b2c659516fa4d4fc901ae3c5832eaeb10f1
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.lock
M extensions/Wikibase/client/i18n/pt.json
M extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
M extensions/Wikibase/client/includes/scribunto/WikibaseLuaBindings.php
M extensions/Wikibase/client/resources/Resources.php
M
extensions/Wikibase/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M extensions/Wikibase/repo/tests/phpunit/includes/RepoHooksTest.php
M vendor/autoload.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
14 files changed, 69 insertions(+), 30 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php
index 06b2e3c..56b402d 100644
--- a/WikibaseClient.settings.php
+++ b/WikibaseClient.settings.php
@@ -1,2 +1,2 @@
<?php
-$wgWBClientSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1414679288";
\ No newline at end of file
+$wgWBClientSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1414754683";
\ No newline at end of file
diff --git a/WikibaseRepo.settings.php b/WikibaseRepo.settings.php
index 955fa70..52ca256 100644
--- a/WikibaseRepo.settings.php
+++ b/WikibaseRepo.settings.php
@@ -1,2 +1,2 @@
<?php
-$wgWBRepoSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1414679288";
\ No newline at end of file
+$wgWBRepoSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1414754683";
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index e79616f..20a634c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1203,12 +1203,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "3f2174db470060a656a57674a0456a8c61196b00"
+ "reference": "e5b869325aaf937d3d5b28fb666fc5bd4bac2fa5"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/3f2174db470060a656a57674a0456a8c61196b00";,
- "reference": "3f2174db470060a656a57674a0456a8c61196b00",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/e5b869325aaf937d3d5b28fb666fc5bd4bac2fa5";,
+ "reference": "e5b869325aaf937d3d5b28fb666fc5bd4bac2fa5",
"shasum": ""
},
"require": {
@@ -1274,7 +1274,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2014-10-30 14:10:33"
+ "time": "2014-10-31 10:17:18"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/i18n/pt.json
b/extensions/Wikibase/client/i18n/pt.json
index e29558c..077439d 100644
--- a/extensions/Wikibase/client/i18n/pt.json
+++ b/extensions/Wikibase/client/i18n/pt.json
@@ -12,7 +12,8 @@
"SandroHc",
"Vitorvicentevalente",
"Waldir",
- 555
+ 555,
+ "He7d3r"
]
},
"wikibase-client-desc": "Cliente para a extensão Wikibase",
@@ -34,7 +35,7 @@
"wikibase-editlinks": "Editar ligações",
"wikibase-editlinkstitle": "Editar ligações interlínguas",
"wikibase-linkitem-addlinks": "Adicionar ligações",
- "wikibase-linkitem-alreadylinked": "A página que pretende ligar já está
vinculado a um [$1 item] no repositório central de dados, cujo liga $2 neste
sítio. Os itens só podem possuir uma página por cada sítio anexado. Por favor,
escolha uma página diferente para vincular.",
+ "wikibase-linkitem-alreadylinked": "A página que pretende ligar já está
vinculado a um [$1 item] no repositório central de dados, o qual está ligado a
$2 neste sítio. Os itens só podem possuir uma página por cada sítio anexado.
Por favor, escolha uma página diferente para vincular.",
"wikibase-linkitem-close": "Fechar caixa de diálogo e recarregar a
página",
"wikibase-linkitem-failure": "Ocorreu um erro desconhecido enquanto
tentava ligar a determinada página.",
"wikibase-linkitem-title": "Ligação com página",
diff --git
a/extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
b/extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
index 2e6d4c5..26a2e41 100644
---
a/extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
+++
b/extensions/Wikibase/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
@@ -41,6 +41,7 @@
$wikibaseClient->getLanguageFallbackChainFactory(),
$language,
$wikibaseClient->getSettings(),
+ $wikibaseClient->getPropertyDataTypeLookup(),
Utils::getLanguageCodes(),
$wikibaseClient->getSettings()->getSetting(
'siteGlobalID' )
);
diff --git
a/extensions/Wikibase/client/includes/scribunto/WikibaseLuaBindings.php
b/extensions/Wikibase/client/includes/scribunto/WikibaseLuaBindings.php
index 017becc..6fc63e6 100644
--- a/extensions/Wikibase/client/includes/scribunto/WikibaseLuaBindings.php
+++ b/extensions/Wikibase/client/includes/scribunto/WikibaseLuaBindings.php
@@ -11,6 +11,7 @@
use Wikibase\Lib\Serializers\SerializerFactory;
use Wikibase\Lib\Store\EntityLookup;
use Wikibase\Lib\Store\SiteLinkLookup;
+use Wikibase\DataModel\Entity\PropertyDataTypeLookup;
use Wikibase\SettingsArray;
/**
@@ -65,12 +66,18 @@
private $siteId;
/**
+ * @var PropertyDataTypeLookup
+ */
+ private $dataTypeLookup;
+
+ /**
* @param EntityIdParser $entityIdParser
* @param EntityLookup $entityLookup
* @param SiteLinkLookup $siteLinkTable
* @param LanguageFallbackChainFactory $fallbackChainFactory
* @param Language $language
* @param SettingsArray $settings
+ * @param PropertyDataTypeLookup $dataTypeLookup
* @param string[] $languageCodes
* @param string $siteId
*/
@@ -81,6 +88,7 @@
LanguageFallbackChainFactory $fallbackChainFactory,
Language $language,
SettingsArray $settings,
+ PropertyDataTypeLookup $dataTypeLookup,
$languageCodes,
$siteId
) {
@@ -92,6 +100,7 @@
$this->settings = $settings;
$this->languageCodes = $languageCodes;
$this->siteId = $siteId;
+ $this->dataTypeLookup = $dataTypeLookup;
}
/**
@@ -161,7 +170,7 @@
*/
private function getEntitySerializer( Entity $entityObject,
$lowerCaseIds ) {
$opt = new SerializationOptions();
- $serializerFactory = new SerializerFactory( $opt );
+ $serializerFactory = new SerializerFactory( $opt,
$this->dataTypeLookup );
// Using "ID_KEYS_BOTH" here means that all lists of Snaks or
Claims will be listed
// twice, once with a lower case key and once with an upper
case key.
diff --git a/extensions/Wikibase/client/resources/Resources.php
b/extensions/Wikibase/client/resources/Resources.php
index 89ac67b..61812b5 100644
--- a/extensions/Wikibase/client/resources/Resources.php
+++ b/extensions/Wikibase/client/resources/Resources.php
@@ -86,6 +86,7 @@
'wikibase.client.PageConnector'
),
'messages' => array(
+ 'wikibase-error-unexpected',
'wikibase-linkitem-alreadylinked',
'wikibase-linkitem-title',
'wikibase-linkitem-linkpage',
diff --git
a/extensions/Wikibase/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
b/extensions/Wikibase/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
index f7afebe..236fe9d 100644
---
a/extensions/Wikibase/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
+++
b/extensions/Wikibase/client/tests/phpunit/includes/scribunto/WikibaseLuaBindingsTest.php
@@ -49,6 +49,11 @@
} )
);
+ $propertyDataTypeLookup = $this->getMock(
'Wikibase\DataModel\Entity\PropertyDataTypeLookup' );
+ $propertyDataTypeLookup->expects( $this->any() )
+ ->method( 'getDataTypeIdForProperty' )
+ ->will( $this->returnValue( 'structured-cat' ) );
+
return new WikibaseLuaBindings(
new BasicEntityIdParser(),
$entityLookup ? $entityLookup : new MockRepository(),
@@ -56,6 +61,7 @@
new LanguageFallbackChainFactory(),
$language, // language
new SettingsArray(),
+ $propertyDataTypeLookup,
array( 'de', 'en', 'es', 'ja' ),
"enwiki" // siteId
);
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
index c53a0ed..7726ef8 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
@@ -236,12 +236,16 @@
this.disable();
- this.$sitelinklistview.one(
- 'sitelinklistviewafterstopediting',
+ this.$sitelinklistview
+ .one(
+
'sitelinklistviewafterstopediting.sitelinkgroupviewstopediting',
function( event, dropValue ) {
self._afterStopEditing( dropValue );
}
- );
+ )
+ .one(
'sitelinklistviewtoggleerror.sitelinkgroupviewstopediting', function( event ) {
+ self.enable();
+ } );
this.$sitelinklistview.data( 'sitelinklistview' ).stopEditing(
dropValue );
},
@@ -254,6 +258,7 @@
this.options.value = this.value();
}
this._isInEditMode = false;
+ this.$sitelinklistview.off( '.sitelinkgroupviewstopediting' );
this.enable();
this.element.removeClass( 'wb-edit' );
this._trigger( 'afterstopediting', null, [dropValue] );
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index 80d0ec6..757fa38 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -353,13 +353,13 @@
.done( function() {
self._afterRemove();
- // Use setTimeout here to break
out of the current call stack.
- // This is needed because the
stack can get very large (if the queue
- // is very large), eventually
leading to failures.
+ // Avoid exceeding call stack
size.
setTimeout( next, 0 );
} )
.fail( function( error ) {
+ $queue.clearQueue(
'stopediting' );
self.setError( error );
+ self._resetEditMode();
} );
} );
}
@@ -380,11 +380,15 @@
function addStopEditToQueue( $queue, sitelinkview, dropValue ) {
$queue.queue( 'stopediting', function( next ) {
sitelinkview.element
- .one(
'sitelinkviewafterstopediting.sitelinklistview', function( event ) {
- // Use setTimeout here to break out of
the current call stack.
- // This is needed because the stack can
get very large (if the queue
- // is very large), eventually leading
to failures.
+ .one(
'sitelinkviewafterstopediting.sitelinklistviewstopediting', function( event ) {
+ sitelinkview.element.off(
'.sitelinklistviewstopediting' );
+ // Avoid exceeding call stack size.
setTimeout( next, 0 );
+ } )
+ .one(
'sitelinkviewtoggleerror.sitelinklistviewstopediting', function() {
+ sitelinkview.element.off(
'.sitelinklistviewstopediting' );
+ $queue.clearQueue( 'stopediting' );
+ self._resetEditMode();
} );
sitelinkview.stopEditing( dropValue );
} );
@@ -402,6 +406,17 @@
$queue.dequeue( 'stopediting' );
},
+ _resetEditMode: function() {
+ this.enable();
+
+ var listview = this.$listview.data( 'listview' ),
+ lia = listview.listItemAdapter();
+
+ listview.items().each( function() {
+ lia.liInstance( $( this ) ).startEditing();
+ } );
+ },
+
/**
* @return {string[]}
*/
diff --git a/extensions/Wikibase/repo/tests/phpunit/includes/RepoHooksTest.php
b/extensions/Wikibase/repo/tests/phpunit/includes/RepoHooksTest.php
index 55cc32c..da74186 100644
--- a/extensions/Wikibase/repo/tests/phpunit/includes/RepoHooksTest.php
+++ b/extensions/Wikibase/repo/tests/phpunit/includes/RepoHooksTest.php
@@ -2,6 +2,7 @@
namespace Wikibase\Tests;
+use ConfigFactory;
use DerivativeContext;
use OutputPage;
use RequestContext;
@@ -145,7 +146,7 @@
wfRestoreWarnings();
$source = $this->getMockImportStream( $xml );
- $importer = new WikiImporter( $source );
+ $importer = new WikiImporter( $source,
ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) );
$importer->setNoticeCallback( function() {
// Do nothing for now. Could collect and compare
notices.
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 7cbbcbe..545df53 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInitb059298dd63f151d018206065015420b::getLoader();
+return ComposerAutoloaderInit6fc987d289ccc10bf8c4f6f2d90bf32f::getLoader();
diff --git a/vendor/composer/autoload_real.php
b/vendor/composer/autoload_real.php
index cc63abc..b930cd1 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInitb059298dd63f151d018206065015420b
+class ComposerAutoloaderInit6fc987d289ccc10bf8c4f6f2d90bf32f
{
private static $loader;
@@ -19,9 +19,9 @@
return self::$loader;
}
-
spl_autoload_register(array('ComposerAutoloaderInitb059298dd63f151d018206065015420b',
'loadClassLoader'), true, true);
+
spl_autoload_register(array('ComposerAutoloaderInit6fc987d289ccc10bf8c4f6f2d90bf32f',
'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInitb059298dd63f151d018206065015420b',
'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInit6fc987d289ccc10bf8c4f6f2d90bf32f',
'loadClassLoader'));
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@@ -42,14 +42,14 @@
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
- composerRequireb059298dd63f151d018206065015420b($file);
+ composerRequire6fc987d289ccc10bf8c4f6f2d90bf32f($file);
}
return $loader;
}
}
-function composerRequireb059298dd63f151d018206065015420b($file)
+function composerRequire6fc987d289ccc10bf8c4f6f2d90bf32f($file)
{
require $file;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 6d9f2f4..a52346b 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1145,12 +1145,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "3f2174db470060a656a57674a0456a8c61196b00"
+ "reference": "e5b869325aaf937d3d5b28fb666fc5bd4bac2fa5"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/3f2174db470060a656a57674a0456a8c61196b00";,
- "reference": "3f2174db470060a656a57674a0456a8c61196b00",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/e5b869325aaf937d3d5b28fb666fc5bd4bac2fa5";,
+ "reference": "e5b869325aaf937d3d5b28fb666fc5bd4bac2fa5",
"shasum": ""
},
"require": {
@@ -1177,7 +1177,7 @@
"conflict": {
"mediawiki/mediawiki": "<1.23"
},
- "time": "2014-10-30 14:10:33",
+ "time": "2014-10-31 10:17:18",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/170306
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac378b2c659516fa4d4fc901ae3c5832eaeb10f1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
