Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/140188
Change subject: Update Wikibase to fix editing site links ...................................................................... Update Wikibase to fix editing site links Change-Id: Ic8cc6aafe50d27cd0b6b6ec194e573157aeec389 --- M composer.lock M extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SiteIdInterface.js M extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SitePageInterface.js M vendor/autoload.php M vendor/composer/autoload_real.php M vendor/composer/installed.json 6 files changed, 90 insertions(+), 100 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/88/140188/1 diff --git a/composer.lock b/composer.lock index ce02a68..da880e8 100644 --- a/composer.lock +++ b/composer.lock @@ -870,12 +870,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git", - "reference": "411010e09f1983ea5e8133629c7c4664c2addd4b" + "reference": "8180e370bb298dd8914c0c72651ac74d97dc2719" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/411010e09f1983ea5e8133629c7c4664c2addd4b", - "reference": "411010e09f1983ea5e8133629c7c4664c2addd4b", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8180e370bb298dd8914c0c72651ac74d97dc2719", + "reference": "8180e370bb298dd8914c0c72651ac74d97dc2719", "shasum": "" }, "require": { @@ -938,7 +938,7 @@ "wikibaserepo", "wikidata" ], - "time": "2014-06-13 16:07:03" + "time": "2014-06-17 19:25:19" } ], "packages-dev": [ diff --git a/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SiteIdInterface.js b/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SiteIdInterface.js index 4872eb4..f19e78e 100644 --- a/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SiteIdInterface.js +++ b/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SiteIdInterface.js @@ -290,10 +290,9 @@ var success = PARENT.prototype._setState.call( this, state ); if( this._inputElem !== null ) { if( state === this.STATE.DISABLED ) { - this._inputElem.autocomplete( 'disable' ); - this._inputElem.autocomplete( 'close' ); + this._inputElem.data( 'siteselector' ).disable(); } else { - this._inputElem.autocomplete( 'enable' ); + this._inputElem.data( 'siteselector' ).enable(); } } return success; diff --git a/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SitePageInterface.js b/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SitePageInterface.js index c0be003..993ec77 100644 --- a/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SitePageInterface.js +++ b/extensions/Wikibase/lib/resources/wikibase.ui.PropertyEditTool.EditableValue.SitePageInterface.js @@ -149,15 +149,6 @@ this._site = site; this._currentResults = []; // empty current suggestions... - if( this.isInEditMode() ) { - this._inputElem.autocomplete( 'search' ); // ...and get new suggestions - - /* // TODO: this should be done after "search" is finished, apparently, there is no callback for that currently... - if( ! this.isValid() ) { - this.setValue( '' ); - } - */ - } }, /** diff --git a/vendor/autoload.php b/vendor/autoload.php index c7dfe7c..3227ae6 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer' . '/autoload_real.php'; -return ComposerAutoloaderInit400f6a0b86460dbbbb86b55598da6865::getLoader(); +return ComposerAutoloaderInit41d569195dc913a7ef0df74f46ae5aea::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index ac32c52..f18a04e 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit400f6a0b86460dbbbb86b55598da6865 +class ComposerAutoloaderInit41d569195dc913a7ef0df74f46ae5aea { private static $loader; @@ -19,9 +19,9 @@ return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit400f6a0b86460dbbbb86b55598da6865', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit41d569195dc913a7ef0df74f46ae5aea', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit400f6a0b86460dbbbb86b55598da6865', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit41d569195dc913a7ef0df74f46ae5aea', '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) { - composerRequire400f6a0b86460dbbbb86b55598da6865($file); + composerRequire41d569195dc913a7ef0df74f46ae5aea($file); } return $loader; } } -function composerRequire400f6a0b86460dbbbb86b55598da6865($file) +function composerRequire41d569195dc913a7ef0df74f46ae5aea($file) { require $file; } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 4e53614..dc9761f 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -842,84 +842,6 @@ ] }, { - "name": "wikibase/wikibase", - "version": "dev-mw1.24-wmf8", - "version_normalized": "dev-mw1.24-wmf8", - "source": { - "type": "git", - "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git", - "reference": "411010e09f1983ea5e8133629c7c4664c2addd4b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/411010e09f1983ea5e8133629c7c4664c2addd4b", - "reference": "411010e09f1983ea5e8133629c7c4664c2addd4b", - "shasum": "" - }, - "require": { - "data-values/common": "~0.2.0", - "data-values/data-types": "~0.3.0", - "data-values/data-values": "~0.1.0", - "data-values/geo": "~0.1.0", - "data-values/interfaces": "~0.1.4", - "data-values/javascript": "~0.5.1", - "data-values/number": "~0.4.0", - "data-values/serialization": "~1.0", - "data-values/time": "~0.5.2", - "data-values/validators": "~0.1.0", - "data-values/value-view": "~0.6.1", - "diff/diff": "~1.0", - "php": ">=5.3.2", - "wikibase/data-model": "~0.7.4", - "wikibase/easyrdf_lite": "~0.8.1" - }, - "conflict": { - "mediawiki/mediawiki": "<1.23" - }, - "time": "2014-06-13 16:07:03", - "type": "mediawiki-extension", - "installation-source": "source", - "autoload": { - "files": [ - "Wikibase.composer.php" - ], - "classmap": [ - "client/includes/", - "client/WikibaseClient.hooks.php", - "client/tests/phpunit/MockPageUpdater.php", - "client/tests/phpunit/MockClientStore.php", - "client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php", - "client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTestCase.php", - "lib/includes/", - "lib/WikibaseLib.hooks.php", - "lib/tests/phpunit/", - "repo/includes/", - "repo/maintenance/", - "repo/tests/phpunit/", - "repo/Wikibase.hooks.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "GNU GPL v2+" - ], - "authors": [ - { - "name": "The Wikidata team", - "role": "Developer" - } - ], - "description": "Structured data repository for MediaWiki", - "homepage": "http://wikiba.se", - "keywords": [ - "wikibase", - "wikibaseclient", - "wikibaselib", - "wikibaserepo", - "wikidata" - ] - }, - { "name": "data-values/value-view", "version": "0.6.2", "version_normalized": "0.6.2.0", @@ -966,5 +888,83 @@ ], "description": "Provides JS widgets to edit values defined by the DataValues library", "homepage": "https://www.mediawiki.org/wiki/Extension:ValueView" + }, + { + "name": "wikibase/wikibase", + "version": "dev-mw1.24-wmf8", + "version_normalized": "dev-mw1.24-wmf8", + "source": { + "type": "git", + "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git", + "reference": "8180e370bb298dd8914c0c72651ac74d97dc2719" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8180e370bb298dd8914c0c72651ac74d97dc2719", + "reference": "8180e370bb298dd8914c0c72651ac74d97dc2719", + "shasum": "" + }, + "require": { + "data-values/common": "~0.2.0", + "data-values/data-types": "~0.3.0", + "data-values/data-values": "~0.1.0", + "data-values/geo": "~0.1.0", + "data-values/interfaces": "~0.1.4", + "data-values/javascript": "~0.5.1", + "data-values/number": "~0.4.0", + "data-values/serialization": "~1.0", + "data-values/time": "~0.5.2", + "data-values/validators": "~0.1.0", + "data-values/value-view": "~0.6.1", + "diff/diff": "~1.0", + "php": ">=5.3.2", + "wikibase/data-model": "~0.7.4", + "wikibase/easyrdf_lite": "~0.8.1" + }, + "conflict": { + "mediawiki/mediawiki": "<1.23" + }, + "time": "2014-06-17 19:25:19", + "type": "mediawiki-extension", + "installation-source": "dist", + "autoload": { + "files": [ + "Wikibase.composer.php" + ], + "classmap": [ + "client/includes/", + "client/WikibaseClient.hooks.php", + "client/tests/phpunit/MockPageUpdater.php", + "client/tests/phpunit/MockClientStore.php", + "client/tests/phpunit/includes/scribunto/WikibaseLuaIntegrationTestItemSetUpHelper.php", + "client/tests/phpunit/includes/scribunto/Scribunto_LuaWikibaseLibraryTestCase.php", + "lib/includes/", + "lib/WikibaseLib.hooks.php", + "lib/tests/phpunit/", + "repo/includes/", + "repo/maintenance/", + "repo/tests/phpunit/", + "repo/Wikibase.hooks.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GNU GPL v2+" + ], + "authors": [ + { + "name": "The Wikidata team", + "role": "Developer" + } + ], + "description": "Structured data repository for MediaWiki", + "homepage": "http://wikiba.se", + "keywords": [ + "wikibase", + "wikibaseclient", + "wikibaselib", + "wikibaserepo", + "wikidata" + ] } ] -- To view, visit https://gerrit.wikimedia.org/r/140188 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8cc6aafe50d27cd0b6b6ec194e573157aeec389 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikidata Gerrit-Branch: master Gerrit-Owner: Hoo man <h...@online.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits