JanZerebecki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/291774
Change subject: Update wikibase/javascript-api to 1.1.1
......................................................................
Update wikibase/javascript-api to 1.1.1
Bug: T136543
Change-Id: I61efa8f0775688296b19161967d083be9b03d6bc
---
M composer.lock
M vendor/composer/autoload_files.php
M vendor/composer/installed.json
M vendor/wikibase/javascript-api/README.md
M vendor/wikibase/javascript-api/WikibaseJavaScriptApi.php
M vendor/wikibase/javascript-api/src/getLocationAgnosticMwApi.js
6 files changed, 63 insertions(+), 58 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/74/291774/1
diff --git a/composer.lock b/composer.lock
index 01175dc..9e00062 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1308,16 +1308,16 @@
},
{
"name": "wikibase/javascript-api",
- "version": "1.1.0",
+ "version": "1.1.1",
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-WikibaseJavaScriptApi.git";,
- "reference": "a9c0202a33f278edd024f0c150d6281a6635bfc0"
+ "reference": "8c5eef73fc5a22c5ddb46da24dbeeaf14094c28c"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-WikibaseJavaScriptApi/zipball/a9c0202a33f278edd024f0c150d6281a6635bfc0";,
- "reference": "a9c0202a33f278edd024f0c150d6281a6635bfc0",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-WikibaseJavaScriptApi/zipball/8c5eef73fc5a22c5ddb46da24dbeeaf14094c28c";,
+ "reference": "8c5eef73fc5a22c5ddb46da24dbeeaf14094c28c",
"shasum": ""
},
"require": {
@@ -1348,7 +1348,7 @@
}
],
"description": "JavaScript client for the Wikibase Repository web
API",
- "time": "2016-02-17 10:46:01"
+ "time": "2016-05-30 17:31:31"
},
{
"name": "wikibase/quality",
diff --git a/vendor/composer/autoload_files.php
b/vendor/composer/autoload_files.php
index 0abc7cb..01a2716 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -20,10 +20,10 @@
'4b37f72a623577cc8b75c6a738dc9d30' => $vendorDir .
'/wikibase/data-model-javascript/init.php',
'7bfd6f61201c5428720c19ba0ef3d730' => $vendorDir .
'/wikimedia/purtle/Purtle.php',
'3a1322766b0dbc9cf396163859b9f864' => $vendorDir .
'/wikibase/serialization-javascript/init.php',
- 'f44e0a54bf5f0864879c4d3e46950b49' => $vendorDir .
'/wikibase/javascript-api/WikibaseJavaScriptApi.php',
'e47bdf5a503f90444b98ecdcab719841' => $vendorDir .
'/wikibase/internal-serialization/mediawiki.php',
'499fed5dd24a6329f26a3973b04c5440' => $baseDir .
'/extensions/ValueView/ValueView.php',
'b27615ec50616984e4b07db5658aba0d' => $vendorDir .
'/data-values/data-types/DataTypes.php',
'0dd9431cbbfa9ed9cb9d565d7129dbaf' => $vendorDir .
'/data-values/validators/Validators.php',
+ 'f44e0a54bf5f0864879c4d3e46950b49' => $vendorDir .
'/wikibase/javascript-api/WikibaseJavaScriptApi.php',
'6b49d0287e368cb66263e04ca7d9699f' => $baseDir .
'/extensions/WikimediaBadges/WikimediaBadges.php',
);
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index ff538ed..a7499ba 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -401,52 +401,6 @@
"description": "Wikibase datamodel serialization implementation in
JavaScript"
},
{
- "name": "wikibase/javascript-api",
- "version": "1.1.0",
- "version_normalized": "1.1.0.0",
- "source": {
- "type": "git",
- "url":
"https://github.com/wikimedia/mediawiki-extensions-WikibaseJavaScriptApi.git";,
- "reference": "a9c0202a33f278edd024f0c150d6281a6635bfc0"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-WikibaseJavaScriptApi/zipball/a9c0202a33f278edd024f0c150d6281a6635bfc0";,
- "reference": "a9c0202a33f278edd024f0c150d6281a6635bfc0",
- "shasum": ""
- },
- "require": {
- "data-values/javascript": "~0.8.0|~0.7.0|~0.6.0"
- },
- "require-dev": {
- "jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.5.1"
- },
- "time": "2016-02-17 10:46:01",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "files": [
- "WikibaseJavaScriptApi.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "GPL-2.0+"
- ],
- "authors": [
- {
- "name": "Adrian Lang",
- "email": "[email protected]"
- },
- {
- "name": "H. Snater",
- "homepage": "http://www.snater.com";
- }
- ],
- "description": "JavaScript client for the Wikibase Repository web API"
- },
- {
"name": "data-values/data-values",
"version": "1.0.0",
"version_normalized": "1.0.0.0",
@@ -1686,5 +1640,51 @@
"support": {
"issues": "https://phabricator.wikimedia.org/project/profile/1202/";
}
+ },
+ {
+ "name": "wikibase/javascript-api",
+ "version": "1.1.1",
+ "version_normalized": "1.1.1.0",
+ "source": {
+ "type": "git",
+ "url":
"https://github.com/wikimedia/mediawiki-extensions-WikibaseJavaScriptApi.git";,
+ "reference": "8c5eef73fc5a22c5ddb46da24dbeeaf14094c28c"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-WikibaseJavaScriptApi/zipball/8c5eef73fc5a22c5ddb46da24dbeeaf14094c28c";,
+ "reference": "8c5eef73fc5a22c5ddb46da24dbeeaf14094c28c",
+ "shasum": ""
+ },
+ "require": {
+ "data-values/javascript": "~0.8.0|~0.7.0|~0.6.0"
+ },
+ "require-dev": {
+ "jakub-onderka/php-parallel-lint": "0.9.2",
+ "mediawiki/mediawiki-codesniffer": "0.5.1"
+ },
+ "time": "2016-05-30 17:31:31",
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "files": [
+ "WikibaseJavaScriptApi.php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "GPL-2.0+"
+ ],
+ "authors": [
+ {
+ "name": "Adrian Lang",
+ "email": "[email protected]"
+ },
+ {
+ "name": "H. Snater",
+ "homepage": "http://www.snater.com";
+ }
+ ],
+ "description": "JavaScript client for the Wikibase Repository web API"
}
]
diff --git a/vendor/wikibase/javascript-api/README.md
b/vendor/wikibase/javascript-api/README.md
index 22f34bc..e6dc91b 100644
--- a/vendor/wikibase/javascript-api/README.md
+++ b/vendor/wikibase/javascript-api/README.md
@@ -6,6 +6,10 @@
## Release notes
+### 1.1.1 (2016-05-30)
+
+* Fix getLocationAgnosticMwApi behavior in Internet Explorer
+
### 1.1.0 (2016-02-17)
* Added optional propertyId parameter to RepoApi::formatValue
diff --git a/vendor/wikibase/javascript-api/WikibaseJavaScriptApi.php
b/vendor/wikibase/javascript-api/WikibaseJavaScriptApi.php
index 157c013..a6d22f2 100644
--- a/vendor/wikibase/javascript-api/WikibaseJavaScriptApi.php
+++ b/vendor/wikibase/javascript-api/WikibaseJavaScriptApi.php
@@ -5,7 +5,7 @@
return 1;
}
-define( 'WIKIBASE_JAVASCRIPT_API_VERSION', '1.1.0' );
+define( 'WIKIBASE_JAVASCRIPT_API_VERSION', '1.1.1' );
// Include the composer autoloader if it is present.
if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
diff --git a/vendor/wikibase/javascript-api/src/getLocationAgnosticMwApi.js
b/vendor/wikibase/javascript-api/src/getLocationAgnosticMwApi.js
index 90c5c61..24c8fa6 100644
--- a/vendor/wikibase/javascript-api/src/getLocationAgnosticMwApi.js
+++ b/vendor/wikibase/javascript-api/src/getLocationAgnosticMwApi.js
@@ -8,6 +8,11 @@
* @return {string}
*/
function getHost( url ) {
+ // Internet Explorer returns an incomplete host (without port) when the
protocol is missing.
+ if ( /^\/\//.test( url ) ) {
+ url = location.protocol + url;
+ }
+
var parser = document.createElement( 'A' );
parser.href = url;
return parser.host;
@@ -26,11 +31,7 @@
* @return {mediaWiki.Api}
*/
wb.api.getLocationAgnosticMwApi = function( apiEndpoint ) {
- var localApiEndpoint = mw.config.get( 'wgServer' )
- + mw.config.get( 'wgScriptPath' )
- + '/api.php';
-
- if ( getHost( localApiEndpoint ) !== getHost( apiEndpoint ) ) {
+ if ( getHost( apiEndpoint ) !== getHost( mw.config.get( 'wgServer' ) )
) {
// Use mw.ForeignApi if the api we want to use is on a
different domain.
return new mw.ForeignApi( apiEndpoint );
}
--
To view, visit https://gerrit.wikimedia.org/r/291774
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61efa8f0775688296b19161967d083be9b03d6bc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.28.0-wmf.3
Gerrit-Owner: JanZerebecki <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
