Tobias Gritschacher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/169663
Change subject: New Wikidata Build - 2014/10/29
......................................................................
New Wikidata Build - 2014/10/29
Change-Id: Iac727c34d59a9d44f4697ef2e550651b9fbef62d
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.lock
M extensions/Wikibase/client/i18n/ru.json
M extensions/Wikibase/client/resources/wikibase.client.getMwApiForRepo.js
M extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js
M extensions/Wikibase/lib/i18n/ru.json
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.edittoolbar.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.singlebuttontoolbar.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css
M extensions/Wikibase/repo/Wikibase.hooks.php
M extensions/Wikibase/repo/i18n/ce.json
M extensions/Wikibase/repo/i18n/ru.json
M extensions/Wikibase/repo/i18n/sr-ec.json
M extensions/Wikibase/repo/includes/actions/ViewEntityAction.php
M extensions/Wikibase/repo/resources/wikibase.ui.entitysearch.js
M vendor/autoload.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
M vendor/wikibase/data-model/WikibaseDataModel.php
M vendor/wikibase/data-model/src/ReferenceList.php
22 files changed, 157 insertions(+), 120 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/63/169663/1
diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php
index b561ba0..7dcc8a1 100644
--- a/WikibaseClient.settings.php
+++ b/WikibaseClient.settings.php
@@ -1,2 +1,2 @@
<?php
-$wgWBClientSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1414492919";
\ No newline at end of file
+$wgWBClientSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1414575514";
\ No newline at end of file
diff --git a/WikibaseRepo.settings.php b/WikibaseRepo.settings.php
index ed18688..89f4c63 100644
--- a/WikibaseRepo.settings.php
+++ b/WikibaseRepo.settings.php
@@ -1,2 +1,2 @@
<?php
-$wgWBRepoSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1414492919";
\ No newline at end of file
+$wgWBRepoSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1414575514";
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index a930553..815e914 100644
--- a/composer.lock
+++ b/composer.lock
@@ -891,16 +891,16 @@
},
{
"name": "wikibase/data-model",
- "version": "2.1.0",
+ "version": "2.1.1",
"source": {
"type": "git",
"url": "https://github.com/wmde/WikibaseDataModel.git";,
- "reference": "b79f935ee553392d71e71e6274bf3e78e9e2d5ac"
+ "reference": "ddb7d18bcd8ed835d3ebdfc20c7a22e0df4049e6"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wmde/WikibaseDataModel/zipball/b79f935ee553392d71e71e6274bf3e78e9e2d5ac";,
- "reference": "b79f935ee553392d71e71e6274bf3e78e9e2d5ac",
+ "url":
"https://api.github.com/repos/wmde/WikibaseDataModel/zipball/ddb7d18bcd8ed835d3ebdfc20c7a22e0df4049e6";,
+ "reference": "ddb7d18bcd8ed835d3ebdfc20c7a22e0df4049e6",
"shasum": ""
},
"require": {
@@ -944,7 +944,7 @@
"wikibase",
"wikidata"
],
- "time": "2014-10-27 18:08:26"
+ "time": "2014-10-28 13:04:15"
},
{
"name": "wikibase/data-model-javascript",
@@ -1203,12 +1203,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "e2b6bd9f9d53f67a37e26286419696ecbf59ef87"
+ "reference": "0cbf92eb74ccde368ebcc53b9a5828ac2e336b7d"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/e2b6bd9f9d53f67a37e26286419696ecbf59ef87";,
- "reference": "e2b6bd9f9d53f67a37e26286419696ecbf59ef87",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/0cbf92eb74ccde368ebcc53b9a5828ac2e336b7d";,
+ "reference": "0cbf92eb74ccde368ebcc53b9a5828ac2e336b7d",
"shasum": ""
},
"require": {
@@ -1274,7 +1274,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2014-10-28 10:36:53"
+ "time": "2014-10-28 22:27:04"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/i18n/ru.json
b/extensions/Wikibase/client/i18n/ru.json
index 97bc9f6..a318906 100644
--- a/extensions/Wikibase/client/i18n/ru.json
+++ b/extensions/Wikibase/client/i18n/ru.json
@@ -28,7 +28,7 @@
"wikibase-comment-sitelink-add": "Интервики-ссылка добавлена: $1.",
"wikibase-comment-sitelink-change": "Интервики-ссылка изменена с $1 на
$2",
"wikibase-comment-sitelink-remove": "Интервики-ссылка удалена: $1",
- "wikibase-comment-multi": "$1
{{PLURAL:$1|изменение|изменений|изменения}}",
+ "wikibase-comment-multi": "$1
{{PLURAL:$1|изменение|изменения|изменений}}",
"wikibase-dataitem": "Элемент {{grammar:genitive|{{WBREPONAME}}}}",
"wikibase-editlinks": "Править ссылки",
"wikibase-editlinkstitle": "Править межъязыковые ссылки",
@@ -63,7 +63,7 @@
"wikibase-unconnectedpages-invalid-language": "«$1» — неправильный код
языка.",
"wikibase-unconnectedpages-page-warning": "Это название страницы не
может быть использовано в данном запросе и игнорируется.",
"wikibase-unconnectedpages-iwdata-label": "Только страницы с
межъязыковыми ссылками:",
- "wikibase-unconnectedpages-format-row": "($1 {{PLURAL:$1|межъязыковая
ссылка|межъязыковых ссылок|межъязыковые ссылки}} на странице)",
+ "wikibase-unconnectedpages-format-row": "($1 {{PLURAL:$1|межъязыковая
ссылка|межъязыковые ссылки|межъязыковых ссылок}} на странице)",
"wikibase-pageinfo-entity-id": "Идентификатор элемента в
{{grammar:genitive|{{WBREPONAME}}}}",
"wikibase-pageinfo-entity-id-none": "отсутствует",
"wikibase-property-render-error": "Ошибка раскрытия свойства «$1»: $2",
diff --git
a/extensions/Wikibase/client/resources/wikibase.client.getMwApiForRepo.js
b/extensions/Wikibase/client/resources/wikibase.client.getMwApiForRepo.js
index 6b5b9e0..34e5840 100644
--- a/extensions/Wikibase/client/resources/wikibase.client.getMwApiForRepo.js
+++ b/extensions/Wikibase/client/resources/wikibase.client.getMwApiForRepo.js
@@ -5,7 +5,7 @@
( function( mw, wb ) {
'use strict';
- var MODULE = wb;
+ var MODULE = wb.client = wb.client || {};
/**
* @return {mediaWiki.Api}
diff --git
a/extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js
b/extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js
index e24ef4b..2219342 100644
--- a/extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js
+++ b/extensions/Wikibase/client/resources/wikibase.client.linkitem.init.js
@@ -31,7 +31,7 @@
$linkItemLink
.show()
.linkitem( {
- mwApiForRepo:
wikibase.getMwApiForRepo(),
+ mwApiForRepo:
wikibase.client.getMwApiForRepo(),
pageTitle: ( new mw.Title(
mw.config.get( 'wgTitle' ),
mw.config.get(
'wgNamespaceNumber' )
diff --git a/extensions/Wikibase/lib/i18n/ru.json
b/extensions/Wikibase/lib/i18n/ru.json
index f0306e4..219ff2f 100644
--- a/extensions/Wikibase/lib/i18n/ru.json
+++ b/extensions/Wikibase/lib/i18n/ru.json
@@ -76,8 +76,8 @@
"wikibase-validator-invalid": "Недопустимое значение",
"wikibase-validator-missing-field": "Отсутствует обязательное поле
'$1'",
"wikibase-validator-bad-type": "$2 вместо $1",
- "wikibase-validator-too-long": "Длина должна быть не более чем $1
{{PLURAL:$1|символ|символов|символа}}",
- "wikibase-validator-too-short": "Длина должна быть не менее чем $1
{{PLURAL:$1|символ|символов|символа}}",
+ "wikibase-validator-too-long": "Длина должна быть не более чем $1
{{PLURAL:$1|символ|символа|символов}}",
+ "wikibase-validator-too-short": "Длина должна быть не менее чем $1
{{PLURAL:$1|символ|символа|символов}}",
"wikibase-validator-too-high": "Вне диапазона, должно быть не больше,
чем $1",
"wikibase-validator-too-low": "Вне диапазона, должно быть не меньше,
чем $1",
"wikibase-validator-malformed-value": "Неверно введены данные: $1",
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
index a3dc679..ae19b6d 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
@@ -243,11 +243,12 @@
* @param {jQuery} $within
*/
function positionElementInOneLineWithAnother( $element, $target,
$within ) {
+ var side = $( 'html' ).prop( 'dir' ) === 'ltr' ? 'left' :
'right';
$element
.stop( ANIMATION_QUEUE, true, false ) // stop all queued
animations, don't jump to end
.position( {
- my: 'left top',
- at: 'left top',
+ my: side + ' top',
+ at: side + ' top',
of: $target,
within: $within,
using: function( css, calc ) {
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.edittoolbar.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.edittoolbar.js
index 48ab3ec..19a07cb 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.edittoolbar.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.edittoolbar.js
@@ -100,9 +100,16 @@
this._buttons = {};
- this._initSubToolbar();
+ var $scrapedSubToolbar = this._getContainer().children(
'.wikibase-toolbar' );
+
+ this._initSubToolbar( $scrapedSubToolbar );
this._attachEventHandlers();
- this._toNonEditMode();
+
+ if( $scrapedSubToolbar.length &&
$scrapedSubToolbar.children().length ) {
+ this.toNonEditMode();
+ } else {
+ this._toNonEditMode();
+ }
},
/**
@@ -156,18 +163,21 @@
/**
* Initializes the sub toolbar encapsulating the toolbar buttons
excluding the tooltip anchor.
+ *
+ * @param {jQuery} $subToolbar
*/
- _initSubToolbar: function() {
- var $container = this._getContainer(),
- $subToolbar = $container.children( '.wikibase-toolbar'
);
+ _initSubToolbar: function( $subToolbar ) {
+ var $content = $();
if( !$subToolbar.length ) {
- $subToolbar = $( '<span/>' ).appendTo( $container );
+ $subToolbar = $( '<span/>' ).appendTo(
this._getContainer() );
} else {
this._scrapeButtons( $subToolbar );
+ $content = $subToolbar.children();
}
$subToolbar.toolbar( {
+ $content: $content,
renderItemSeparators: true
} );
},
@@ -251,27 +261,22 @@
this._getContainer()
.on( 'toolbarbuttonaction.' + this.widgetName, function( event
) {
- switch( event.target ) {
- case self._buttons.edit.get( 0 ):
-
self.options.interactionWidget.element.one(
- prefix + 'afterstartediting.' +
self.widgetName,
- function() {
- self._trigger( 'edit' );
- }
- );
-
self.options.interactionWidget.startEditing();
- break;
- case self._buttons.save.get( 0 ):
-
self.options.interactionWidget.stopEditing();
- break;
- case self.options.onRemove &&
self._buttons.remove.get( 0 ):
- self.disable();
- self.toggleActionMessage( mw.msg(
'wikibase-remove-inprogress' ) );
- self.options.onRemove();
- break;
- case self._buttons.cancel.get( 0 ):
-
self.options.interactionWidget.cancelEditing();
- break;
+ if( self._buttons.edit && event.target ===
self._buttons.edit.get( 0 ) ) {
+ self.options.interactionWidget.element.one(
+ prefix + 'afterstartediting.' +
self.widgetName,
+ function() {
+ self._trigger( 'edit' );
+ }
+ );
+ self.options.interactionWidget.startEditing();
+ } else if( self._buttons.save && event.target ===
self._buttons.save.get( 0 ) ) {
+ self.options.interactionWidget.stopEditing();
+ } else if( self._buttons.remove && event.target ===
self._buttons.remove.get( 0 ) ) {
+ self.disable();
+ self.toggleActionMessage( mw.msg(
'wikibase-remove-inprogress' ) );
+ self.options.onRemove();
+ } else if( self._buttons.cancel && event.target ===
self._buttons.cancel.get( 0 ) ) {
+ self.options.interactionWidget.cancelEditing();
}
} );
},
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.singlebuttontoolbar.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.singlebuttontoolbar.js
index ac3b0dc..3fc2976 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.singlebuttontoolbar.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.singlebuttontoolbar.js
@@ -46,29 +46,21 @@
PARENT.prototype._create.call( this );
if( !this.options.$content.length ) {
- this.options.$content = this._initDefaultButton();
- this.draw();
+ var $scrapedButton = this._scrapeButton();
+ this.options.$content = this._initDefaultButton(
$scrapedButton );
+ if( !$scrapedButton ) {
+ this.draw();
+ }
}
},
/**
+ * @param {jQuery|null} $scrapedButton
* @return {jQuery}
*/
- _initDefaultButton: function() {
+ _initDefaultButton: function( $scrapedButton ) {
var self = this,
- $container = this._getContainer(),
- $defaultButton = null;
-
- // Scrape button from existing DOM if there is:
- $container.children( '.wikibase-toolbar-button' ).each(
function() {
- var $button = $( this );
- if( $button.text() === self.options.label ) {
- $defaultButton = $button;
- return false;
- }
- } );
-
- $defaultButton = $defaultButton || $( '<span/>' ).appendTo(
$container );
+ $defaultButton = $scrapedButton || $( '<span/>' );
return $defaultButton.toolbarbutton( {
$label: this.options.label,
@@ -79,6 +71,24 @@
} );
},
+ /**
+ * @return {jQuery}
+ */
+ _scrapeButton: function() {
+ var self = this,
+ $defaultButton = null;
+
+ this._getContainer().children( '.wikibase-toolbar-button'
).each( function() {
+ var $button = $( this );
+ if( $button.text() === self.options.label ) {
+ $defaultButton = $button;
+ return false;
+ }
+ } );
+
+ return $defaultButton;
+ },
+
focus: function() {
var button = this.options.$content.first().data(
'toolbarbutton' );
if( button ) {
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css
b/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css
index 8732ce1..614b3ec 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/themes/default/jquery.wikibase.toolbarbutton.css
@@ -3,18 +3,18 @@
* @author H. Snater < [email protected] >
*/
-.wikibase-toolbarbutton.ui-state-disabled a {
+.wikibase-toolbarbutton-disabled a {
cursor: default;
}
-.wikibase-toolbarbutton.ui-state-disabled a:link,
-.wikibase-toolbarbutton.ui-state-disabled a:hover,
-.wikibase-toolbarbutton.ui-state-disabled a:active,
-.wikibase-toolbarbutton.ui-state-disabled a:visited {
+.wikibase-toolbarbutton-disabled a:link,
+.wikibase-toolbarbutton-disabled a:hover,
+.wikibase-toolbarbutton-disabled a:active,
+.wikibase-toolbarbutton-disabled a:visited {
color: grey;
text-decoration: none;
}
-.wikibase-toolbarbutton.ui-state-disabled .ui-icon {
+.wikibase-toolbarbutton-disabled .ui-icon {
background-image:
url(../../../../../../../../resources/lib/jquery.ui/themes/smoothness/images/ui-icons_888888_256x240.png);
}
diff --git a/extensions/Wikibase/repo/Wikibase.hooks.php
b/extensions/Wikibase/repo/Wikibase.hooks.php
index e02daaa..677e8d4 100644
--- a/extensions/Wikibase/repo/Wikibase.hooks.php
+++ b/extensions/Wikibase/repo/Wikibase.hooks.php
@@ -951,7 +951,7 @@
*/
public static function onShowSearchHitTitle( &$link_t, &$titleSnippet,
SearchResult $result ) {
$title = $result->getTitle();
- $entityNamespaceLookup =
WikibsseRepo::getDefaultInstance()->getEntityNamespaceLookup();
+ $entityNamespaceLookup =
WikibaseRepo::getDefaultInstance()->getEntityNamespaceLookup();
if ( $entityNamespaceLookup->isEntityNamespace(
$title->getNamespace() ) ) {
$titleSnippet = $title->getPrefixedText();
diff --git a/extensions/Wikibase/repo/i18n/ce.json
b/extensions/Wikibase/repo/i18n/ce.json
index f4b90c3..54230dd 100644
--- a/extensions/Wikibase/repo/i18n/ce.json
+++ b/extensions/Wikibase/repo/i18n/ce.json
@@ -49,7 +49,7 @@
"wikibase-statementview-rank-normal": "ЛартӀахь йолу ранг",
"wikibase-statementview-rank-deprecated": "Мегаш йоцу ранг",
"wikibase-statementview-referencesheading-pendingcountersubject":
"{{PLURAL:$1|1=хьост|хьосташ}}",
- "wikibase-statementview-referencesheading-pendingcountertooltip":
"{{PLURAL:$1|Цхьаъ хьост Ӏалашйина яц|$1 хьосташ Ӏалашйина яц|$1 хьост
Ӏалашйина яц}}",
+ "wikibase-statementview-referencesheading-pendingcountertooltip":
"{{PLURAL:$1|Цхьаъ хьост Ӏалашйина яц|$1 хьост Ӏалашйина яц|$1 хьосташ
Ӏалашйина яц}}",
"wikibase-snakview-property-input-placeholder": "билгало",
"wikibase-snakview-choosesnaktype": "Харжа маьӀан тайп.",
"wikibase-snakview-variations-somevalue-label": "маьӀна хууш дац",
diff --git a/extensions/Wikibase/repo/i18n/ru.json
b/extensions/Wikibase/repo/i18n/ru.json
index 678b7d6..39a442e 100644
--- a/extensions/Wikibase/repo/i18n/ru.json
+++ b/extensions/Wikibase/repo/i18n/ru.json
@@ -65,7 +65,7 @@
"wikibase-undo-firstrev": "Создание страницы отменить невозможно",
"wikibase-undo-nocontent": "Не удается загрузить содержимое версии $2
страницы «$1»",
"wikibase-propertyedittool-counter-pending-tooltip": "{{PLURAL:$1|1=Ещё
не сохранено одно значение|Несохранённых значений: $1}}",
- "wikibase-propertyedittool-counter-entrieslabel":
"{{PLURAL:$1|запись|записей|записи}}",
+ "wikibase-propertyedittool-counter-entrieslabel":
"{{PLURAL:$1|запись|записи|записей}}",
"wikibase-sitelinksedittool-full": "Ссылки на страницы уже заданы для
всех известных сайтов.",
"wikibase-disambiguation-title": "Разрешение неоднозначности для «$1»",
"wb-special-newitem-new-item-notification": "Новый элемент «$1» создан
и перенаправлен на его страницу. Вернуться к «$2».",
@@ -78,8 +78,8 @@
"wikibase-statementview-rank-preferred": "Предпочтительный ранг",
"wikibase-statementview-rank-normal": "Нормальный ранг",
"wikibase-statementview-rank-deprecated": "Нерекомендуемый ранг",
- "wikibase-statementview-referencesheading-pendingcountersubject":
"{{PLURAL:$1|источник|источников|источника}}",
- "wikibase-statementview-referencesheading-pendingcountertooltip":
"{{PLURAL:$1|$1 источник ещё не сохранён|$1 источников ещё не сохранёны|$1
источника ещё не сохранены|1=Источник ещё не сохранён}}",
+ "wikibase-statementview-referencesheading-pendingcountersubject":
"{{PLURAL:$1|источник|источника|источников}}",
+ "wikibase-statementview-referencesheading-pendingcountertooltip":
"{{PLURAL:$1|$1 источник ещё не сохранён|$1 источника ещё не сохранены|$1
источников ещё не сохранёны|1=Источник ещё не сохранён}}",
"wikibase-snakview-property-input-placeholder": "свойство",
"wikibase-snakview-unsupportedsnaktype": "Соединитель (снэк) типа «$1».
Обработка этого класса соединителей пока не поддерживается.",
"wikibase-snakview-choosesnaktype": "Выберите тип значения.",
diff --git a/extensions/Wikibase/repo/i18n/sr-ec.json
b/extensions/Wikibase/repo/i18n/sr-ec.json
index 0f91796..0756425 100644
--- a/extensions/Wikibase/repo/i18n/sr-ec.json
+++ b/extensions/Wikibase/repo/i18n/sr-ec.json
@@ -196,6 +196,8 @@
"wikibase-item-summary-wbsetclaim-update-references":
"{{PLURAL:$4|Измењена референца|Измењено $4 референци}} на
{{PLURAL:$3|тврдњу|тврдњи}}",
"wikibase-item-summary-wbsetclaim-update-rank": "Промењен ранг
{{PLURAL:$3|тврдњи|тврдњама}}",
"wikibase-item-summary-clientsitelink-update": "Страница премештена са
[$3] на [$4]",
+ "wikibase-item-summary-wbmergeitems-from": "Спојена ставка из „$3“",
+ "wikibase-item-summary-wbmergeitems-to": "Спојена ставка у „$3“",
"wikibase-property-summary-wbcreate-new": "Направљено ново својство",
"wikibase-property-summary-wbeditentity-create": "Направљено ново
својство",
"wikibase-property-summary-wbeditentity-update": "Измењено својство",
diff --git a/extensions/Wikibase/repo/includes/actions/ViewEntityAction.php
b/extensions/Wikibase/repo/includes/actions/ViewEntityAction.php
index 7160d7c..a83ded6 100644
--- a/extensions/Wikibase/repo/includes/actions/ViewEntityAction.php
+++ b/extensions/Wikibase/repo/includes/actions/ViewEntityAction.php
@@ -131,17 +131,15 @@
/**
* Returns true if this view action is performing a plain view (not a
diff, etc)
* of the page's current revision.
+ *
+ * @return bool
*/
private function isEditable() {
- if ( !$this->getArticle()->isCurrent() || $this->isDiff() ) {
- return false;
- }
-
- return true;
+ return !$this->isDiff() && $this->getArticle()->isCurrent();
}
/**
- * @return boolean
+ * @return bool
*/
private function isDiff() {
return $this->getRequest()->getCheck( 'diff' );
@@ -187,6 +185,7 @@
/**
* @param OutputPage $outputPage
+ * @param EntityContent $content
*/
private function applyLabelToTitleText( OutputPage $outputPage,
EntityContent $content ) {
// Figure out which label to use for title.
@@ -256,8 +255,6 @@
* @since 0.1
*/
protected function displayMissingEntity() {
- global $wgSend404Code;
-
$title = $this->getArticle()->getTitle();
$oldid = $this->getArticle()->getOldID();
@@ -278,11 +275,7 @@
'msgKey' => array( 'moveddeleted-notice' ) )
);
- if ( $wgSend404Code ) {
- // If there's no backing content, send a 404 Not Found
- // for better machine handling of broken links.
- $this->getRequest()->response()->header( "HTTP/1.1 404
Not Found" );
- }
+ $this->send404Code();
$hookResult = wfRunHooks( 'BeforeDisplayNoArticleText', array(
$this ) );
@@ -323,6 +316,16 @@
}
}
+ private function send404Code() {
+ global $wgSend404Code;
+
+ if ( $wgSend404Code ) {
+ // If there's no backing content, send a 404 Not Found
+ // for better machine handling of broken links.
+ $this->getRequest()->response()->header( 'HTTP/1.1 404
Not Found' );
+ }
+ }
+
/**
* @see Action::getDescription()
*/
diff --git a/extensions/Wikibase/repo/resources/wikibase.ui.entitysearch.js
b/extensions/Wikibase/repo/resources/wikibase.ui.entitysearch.js
index 0b8e177..6d62e58 100644
--- a/extensions/Wikibase/repo/resources/wikibase.ui.entitysearch.js
+++ b/extensions/Wikibase/repo/resources/wikibase.ui.entitysearch.js
@@ -2,7 +2,6 @@
* Replacing the native MediaWiki search suggestions with Wikibase's entity
selector widget.
*
* @license GNU GPL v2+
- * @author Jens Ohlig
* @author H. Snater < [email protected] >
*/
( function( $, mw ) {
@@ -50,11 +49,34 @@
$hiddenInput = $( '<input type="hidden"
name="search"/>' );
/**
- * Updates the suggestion list special item that triggers a
full-text search.
+ * @param {jQuery} $form
+ * @return {string}
*/
- function updateSuggestionSpecial() {
+ function getHref( $form ) {
+ var href = $form.attr( 'action' ),
+ params = {};
+
+ href += href.indexOf( '?' ) === -1 ? '?' : '&';
+
+ $.each( $form.serializeArray(), function( i, param ) {
+ params[param.name] = param.value;
+ } );
+
+ params.search = $input.val();
+
+ return href + $.param( params );
+ }
+
+ /**
+ * Updates the suggestion list special item that triggers a
full-text search.
+ *
+ * @param {jQuery.ui.ooMenu.CustomItem} searchContaining
+ */
+ function updateSuggestionSpecial( searchContaining ) {
var $suggestionsSpecial = $(
'.wb-entitysearch-suggestions .suggestions-special' );
$suggestionsSpecial.find( '.special-query' ).text(
$input.val() );
+
+ searchContaining.setLink( getHref( $form ) +
'&fulltext=1' );
}
/**
@@ -78,12 +100,12 @@
.addClass( 'special-query' )
);
+ var searchContaining = new $.ui.ooMenu.CustomItem(
$searchContaining, null, function() {
+ $form.submit();
+ }, 'wb-entitysearch-suggestions' );
+
var $searchMenu = $( '<ul/>' ).ooMenu( {
- customItems: [
- new $.ui.ooMenu.CustomItem( $searchContaining,
null, function() {
- $form.submit();
- }, 'wb-entitysearch-suggestions' )
- ]
+ customItems: [searchContaining]
} );
$input
@@ -116,11 +138,11 @@
)
} )
.on( 'entityselectoropen', function( event ) {
- updateSuggestionSpecial();
+ updateSuggestionSpecial( searchContaining );
} )
.on( 'eachchange', function( event, oldVal ) {
$hiddenInput.val( '' );
- updateSuggestionSpecial();
+ updateSuggestionSpecial( searchContaining );
} )
.on( 'entityselectorselected', function( event, entityId ) {
$hiddenInput.val( entityId );
diff --git a/vendor/autoload.php b/vendor/autoload.php
index ea1e402..98d589b 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit3f3bac61352650f5647a8755cda1c5a6::getLoader();
+return ComposerAutoloaderInitc3eb3df05b898d3e2d9890a565e62104::getLoader();
diff --git a/vendor/composer/autoload_real.php
b/vendor/composer/autoload_real.php
index b81a05d..fd96070 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit3f3bac61352650f5647a8755cda1c5a6
+class ComposerAutoloaderInitc3eb3df05b898d3e2d9890a565e62104
{
private static $loader;
@@ -19,9 +19,9 @@
return self::$loader;
}
-
spl_autoload_register(array('ComposerAutoloaderInit3f3bac61352650f5647a8755cda1c5a6',
'loadClassLoader'), true, true);
+
spl_autoload_register(array('ComposerAutoloaderInitc3eb3df05b898d3e2d9890a565e62104',
'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInit3f3bac61352650f5647a8755cda1c5a6',
'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInitc3eb3df05b898d3e2d9890a565e62104',
'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) {
- composerRequire3f3bac61352650f5647a8755cda1c5a6($file);
+ composerRequirec3eb3df05b898d3e2d9890a565e62104($file);
}
return $loader;
}
}
-function composerRequire3f3bac61352650f5647a8755cda1c5a6($file)
+function composerRequirec3eb3df05b898d3e2d9890a565e62104($file)
{
require $file;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 4e33e88..e22883b 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -318,17 +318,17 @@
},
{
"name": "wikibase/data-model",
- "version": "2.1.0",
- "version_normalized": "2.1.0.0",
+ "version": "2.1.1",
+ "version_normalized": "2.1.1.0",
"source": {
"type": "git",
"url": "https://github.com/wmde/WikibaseDataModel.git";,
- "reference": "b79f935ee553392d71e71e6274bf3e78e9e2d5ac"
+ "reference": "ddb7d18bcd8ed835d3ebdfc20c7a22e0df4049e6"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wmde/WikibaseDataModel/zipball/b79f935ee553392d71e71e6274bf3e78e9e2d5ac";,
- "reference": "b79f935ee553392d71e71e6274bf3e78e9e2d5ac",
+ "url":
"https://api.github.com/repos/wmde/WikibaseDataModel/zipball/ddb7d18bcd8ed835d3ebdfc20c7a22e0df4049e6";,
+ "reference": "ddb7d18bcd8ed835d3ebdfc20c7a22e0df4049e6",
"shasum": ""
},
"require": {
@@ -339,7 +339,7 @@
"require-dev": {
"whatthejeff/nyancat-phpunit-resultprinter": "~1.2"
},
- "time": "2014-10-27 18:08:26",
+ "time": "2014-10-28 13:04:15",
"type": "library",
"extra": {
"branch-alias": {
@@ -1145,12 +1145,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "e2b6bd9f9d53f67a37e26286419696ecbf59ef87"
+ "reference": "0cbf92eb74ccde368ebcc53b9a5828ac2e336b7d"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/e2b6bd9f9d53f67a37e26286419696ecbf59ef87";,
- "reference": "e2b6bd9f9d53f67a37e26286419696ecbf59ef87",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/0cbf92eb74ccde368ebcc53b9a5828ac2e336b7d";,
+ "reference": "0cbf92eb74ccde368ebcc53b9a5828ac2e336b7d",
"shasum": ""
},
"require": {
@@ -1177,7 +1177,7 @@
"conflict": {
"mediawiki/mediawiki": "<1.23"
},
- "time": "2014-10-28 10:36:53",
+ "time": "2014-10-28 22:27:04",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
diff --git a/vendor/wikibase/data-model/WikibaseDataModel.php
b/vendor/wikibase/data-model/WikibaseDataModel.php
index 6831f6c..2a2e1e2 100644
--- a/vendor/wikibase/data-model/WikibaseDataModel.php
+++ b/vendor/wikibase/data-model/WikibaseDataModel.php
@@ -12,7 +12,7 @@
return 1;
}
-define( 'WIKIBASE_DATAMODEL_VERSION', '2.1 alpha' );
+define( 'WIKIBASE_DATAMODEL_VERSION', '2.1.1' );
if ( defined( 'MEDIAWIKI' ) ) {
call_user_func( function() {
diff --git a/vendor/wikibase/data-model/src/ReferenceList.php
b/vendor/wikibase/data-model/src/ReferenceList.php
index 04656c8..0cdc6ac 100644
--- a/vendor/wikibase/data-model/src/ReferenceList.php
+++ b/vendor/wikibase/data-model/src/ReferenceList.php
@@ -190,13 +190,7 @@
* @return string
*/
public function serialize() {
- $references = array();
-
- foreach( $this as $reference ) {
- $references[] = $reference;
- }
-
- return serialize( $references );
+ return serialize( iterator_to_array( $this ) );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/169663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac727c34d59a9d44f4697ef2e550651b9fbef62d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
