jenkins-bot has submitted this change and it was merged.
Change subject: New Wikidata Build - 2014/10/30 - 2
......................................................................
New Wikidata Build - 2014/10/30 - 2
Change-Id: Ib28b87d47017af75837387340c47dbe27b7c7e49
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.lock
M extensions/Wikibase/build/travis/install.sh
M extensions/Wikibase/lib/includes/modules/TemplateModule.php
M extensions/Wikibase/lib/resources/api/getLocationAgnosticMwApi.js
M extensions/Wikibase/lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
M extensions/Wikibase/lib/resources/jquery.wikibase/snakview/snakview.js
M
extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.toolbar.js
M extensions/Wikibase/lib/resources/templates.js
M extensions/Wikibase/lib/tests/qunit/templates.tests.js
M vendor/autoload.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
21 files changed, 108 insertions(+), 72 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php
index cdcfe01..06b2e3c 100644
--- a/WikibaseClient.settings.php
+++ b/WikibaseClient.settings.php
@@ -1,2 +1,2 @@
<?php
-$wgWBClientSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1414660416";
\ No newline at end of file
+$wgWBClientSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1414679288";
\ No newline at end of file
diff --git a/WikibaseRepo.settings.php b/WikibaseRepo.settings.php
index 6cefc0e..955fa70 100644
--- a/WikibaseRepo.settings.php
+++ b/WikibaseRepo.settings.php
@@ -1,2 +1,2 @@
<?php
-$wgWBRepoSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1414660416";
\ No newline at end of file
+$wgWBRepoSettings["sharedCacheKeyPrefix"] = "wikibase:WBL/1414679288";
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 3c6a90b..e79616f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1203,12 +1203,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "3e5ecbf1d8eef4fc4f8f2ff70fd211e08d855eb4"
+ "reference": "3f2174db470060a656a57674a0456a8c61196b00"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/3e5ecbf1d8eef4fc4f8f2ff70fd211e08d855eb4";,
- "reference": "3e5ecbf1d8eef4fc4f8f2ff70fd211e08d855eb4",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/3f2174db470060a656a57674a0456a8c61196b00";,
+ "reference": "3f2174db470060a656a57674a0456a8c61196b00",
"shasum": ""
},
"require": {
@@ -1274,7 +1274,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2014-10-29 22:42:41"
+ "time": "2014-10-30 14:10:33"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/build/travis/install.sh
b/extensions/Wikibase/build/travis/install.sh
index 931c2cf..a68da71 100644
--- a/extensions/Wikibase/build/travis/install.sh
+++ b/extensions/Wikibase/build/travis/install.sh
@@ -11,6 +11,7 @@
mv mediawiki-$MW phase3
cd phase3
+composer install --no-dev
wget https://phar.phpunit.de/phpunit.phar
chmod +x phpunit.phar
mv phpunit.phar tests/phpunit/
diff --git a/extensions/Wikibase/lib/includes/modules/TemplateModule.php
b/extensions/Wikibase/lib/includes/modules/TemplateModule.php
index 54b1837..d943768 100644
--- a/extensions/Wikibase/lib/includes/modules/TemplateModule.php
+++ b/extensions/Wikibase/lib/includes/modules/TemplateModule.php
@@ -33,9 +33,9 @@
( function( mw ) {
'use strict';
- mw.templates = mw.templates || {};
- mw.templates.store = new mw.Map();
- mw.templates.store.set( $templatesJson );
+ mw.wbTemplates = mw.wbTemplates || {};
+ mw.wbTemplates.store = new mw.Map();
+ mw.wbTemplates.store.set( $templatesJson );
}( mediaWiki ) );
EOT;
diff --git a/extensions/Wikibase/lib/resources/api/getLocationAgnosticMwApi.js
b/extensions/Wikibase/lib/resources/api/getLocationAgnosticMwApi.js
index 0c832f4..dc2cbd9 100644
--- a/extensions/Wikibase/lib/resources/api/getLocationAgnosticMwApi.js
+++ b/extensions/Wikibase/lib/resources/api/getLocationAgnosticMwApi.js
@@ -6,6 +6,14 @@
'use strict';
/**
+ * @param {string} url
+ * @return {string}
+ */
+function getDomainName( url ) {
+ return url.replace( /.*\/\//, '' ).replace( /\/.*/, '' );
+}
+
+/**
* Returns a mediaWiki.Api instance which can transparently interact with
remote APIs.
* @since 0.5
* @todo Merge this into mw.Api
@@ -17,25 +25,29 @@
var localApiEndpoint = mw.config.get( 'wgServer' )
+ mw.config.get( 'wgScriptPath' )
+ '/api.php';
- var mwApiOptions = {};
- if( localApiEndpoint !== apiEndpoint ) {
+ var mwApiOptions = {
+ ajax: {
+ url: apiEndpoint
+ }
+ };
+
+ if ( getDomainName( localApiEndpoint ) !== getDomainName( apiEndpoint )
) {
+ // Use CORS if the api we want to use is on a different domain.
+ // But don't if it's not: CORS isn't required if we are on the
same domain, thus it
+ // might not be configured and fail.
var corsOrigin = mw.config.get( 'wgServer' );
if ( corsOrigin.indexOf( '//' ) === 0 ) {
// The origin parameter musn't be protocol relative
corsOrigin = document.location.protocol + corsOrigin;
}
- mwApiOptions = {
- ajax: {
- url: apiEndpoint,
- xhrFields: {
- withCredentials: true
- },
- crossDomain: true
- },
- parameters: {
- origin: corsOrigin
- }
+
+ mwApiOptions.ajax.xhrFields = {
+ withCredentials: true
+ };
+ mwApiOptions.ajax.crossDomain = true;
+ mwApiOptions.parameters = {
+ origin: corsOrigin
};
}
diff --git
a/extensions/Wikibase/lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js
b/extensions/Wikibase/lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js
index 362761c..939994c 100644
--- a/extensions/Wikibase/lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js
+++ b/extensions/Wikibase/lib/resources/jquery.ui/jquery.ui.TemplatedWidget.js
@@ -8,7 +8,7 @@
var PARENT = $.Widget;
/**
- * Base prototype for all widgets which use the mw.template templating
system to create a basic
+ * Base prototype for all widgets which use the mw.wbTemplate
templating system to create a basic
* DOM structure for internal usage.
*
* @constructor
@@ -23,7 +23,7 @@
* replaced by the Widget's subject node.
*
* @option templateParams {Array} Parameters given to the template on
its initial construction.
- * A parameter can be what is compatible with mw.template but
can also be a function
+ * A parameter can be what is compatible with wm.wbTemplate but
can also be a function
* which will be executed in the widget's context and provide
the parameter's value by
* its return value.
*
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
index c3433bc..4234bab 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
@@ -113,7 +113,7 @@
for( var i = 0; i < this.options.value.aliases.length;
i++ ) {
this.$list.append(
- mw.template(
'wikibase-aliasesview-list-item', this.options.value.aliases[i] )
+ mw.wbTemplate(
'wikibase-aliasesview-list-item', this.options.value.aliases[i] )
);
}
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
index f166de3..8d77e7f 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
@@ -303,7 +303,7 @@
.addClass( self.widgetBaseClass + '-menuitem-'
+ itemId )
.data( self.widgetName + '-menuitem-badge',
itemId )
.append( $item
- .prepend( mw.template( 'wb-badge',
+ .prepend( mw.wbTemplate( 'wb-badge',
itemId + ' ' + cssClasses,
( item && item.getLabel(
self.options.languageCode ) ) || itemId,
itemId
@@ -383,7 +383,7 @@
return;
}
this.element.append(
- mw.template( 'wb-badge',
+ mw.wbTemplate( 'wb-badge',
badgeId + ' ' + this.options.badges[badgeId],
badgeId,
badgeId
@@ -398,7 +398,7 @@
var badgeItem = badges[badgeId],
$placeholderBadge = this.element.children(
'[data-wb-badge="' + badgeId + '"]' );
- var $badge = mw.template( 'wb-badge',
+ var $badge = mw.wbTemplate( 'wb-badge',
badgeId + ' ' + this.options.badges[badgeId],
badgeItem && badgeItem.getLabel(
this.options.languageCode ) || badgeId,
badgeId
@@ -415,7 +415,7 @@
* Creates an empty badge to be displayed as menu anchor when no badges
are selected.
*/
_addEmptyBadge: function() {
- this.element.append( mw.template( 'wb-badge',
+ this.element.append( mw.wbTemplate( 'wb-badge',
'empty',
this.options.messages['badge-placeholder-title'],
''
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
index ceef590..b34a207 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
@@ -182,7 +182,7 @@
$title =
wb.utilities.ui.buildMissingEntityInfo( propertyId, wb.datamodel.Property );
}
- self.element.append( mw.template(
'wb-claimgrouplistview-groupname', $title ) );
+ self.element.append( mw.wbTemplate(
'wb-claimgrouplistview-groupname', $title ) );
} );
},
@@ -407,7 +407,7 @@
if( !$container.length ) {
// TODO: Remove layout-specific toolbar wrapper
$container = $( '<div/>' ).appendTo(
- mw.template(
'wikibase-toolbar-wrapper', '' ).appendTo( $claimlistview )
+ mw.wbTemplate(
'wikibase-toolbar-wrapper', '' ).appendTo( $claimlistview )
);
}
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index 2421a20..43db52d 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -112,7 +112,7 @@
this.$label = $( '.wb-firstHeading .wikibase-labelview',
this.element ).first();
if( !this.$label.length ) {
this.$label = $( '<div/>' );
- mw.template( 'wikibase-firstHeading',
+ mw.wbTemplate( 'wikibase-firstHeading',
this.options.value.getId(),
this.$label
).appendTo( this.element );
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
index 2a0ded7..6f8ee4c 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
@@ -368,7 +368,7 @@
// size)
if( !$container.length ) {
$container = $( '<span/>' ).appendTo(
- mw.template(
'wikibase-toolbar-wrapper', '' )
+ mw.wbTemplate(
'wikibase-toolbar-wrapper', '' )
.appendTo( $labelview.find(
'.wikibase-labelview-container' ) )
);
}
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 eaff444..80d0ec6 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -53,7 +53,7 @@
'', // table header
'', // listview
function() {
- return mw.template(
'wikibase-sitelinklistview-tfoot',
+ return mw.wbTemplate(
'wikibase-sitelinklistview-tfoot',
this.isFull() ? mw.msg(
'wikibase-sitelinksedittool-full' ) : '',
'' // toolbar
);
@@ -702,7 +702,7 @@
siteNameMessageKey += '-special';
}
- this.$thead.append( mw.template(
'wikibase-sitelinklistview-thead',
+ this.$thead.append( mw.wbTemplate(
'wikibase-sitelinklistview-thead',
mw.message( siteNameMessageKey ).text(),
mw.message( 'wikibase-sitelinks-siteid-columnheading'
).text(),
mw.message( 'wikibase-sitelinks-link-columnheading'
).text()
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
index 438ddfa..ef9b01c 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
@@ -170,10 +170,10 @@
site = this._getSite();
this.$link.append(
- mw.template( 'wikibase-sitelinkview-pagename',
+ mw.wbTemplate( 'wikibase-sitelinkview-pagename',
siteLink ? site.getUrlTo(
siteLink.getPageName() ) : '',
siteLink ? siteLink.getPageName() : '',
- mw.template( 'wikibase-badgeselector',
'' ),
+ mw.wbTemplate(
'wikibase-badgeselector', '' ),
site ? site.getLanguageCode() : '',
site ? site.getLanguageDirection() :
'auto'
)
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/snakview/snakview.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/snakview/snakview.js
index bb7450d..180db6c 100644
--- a/extensions/Wikibase/lib/resources/jquery.wikibase/snakview/snakview.js
+++ b/extensions/Wikibase/lib/resources/jquery.wikibase/snakview/snakview.js
@@ -112,6 +112,13 @@
_variation: null,
/**
+ * Cache for the values of specific wikibase.snakview.variations in
order to have those restored
+ * when toggling he snak type.
+ * @type {Object}
+ */
+ _cachedValues: null,
+
+ /**
* The property of the Snak currently represented by the view.
* @type {String}
*/
@@ -165,6 +172,8 @@
this._entityStore = this.option( 'entityStore' );
this._valueViewBuilder = this.option( 'valueViewBuilder' );
+
+ this._cachedValues = {};
// set value, can be a wb.datamodel.Snak or plain Object as
wb.datamodel.Snak.toMap() or just pieces of it
this.value( this.option( 'value' ) || {} );
@@ -554,6 +563,10 @@
* @param {Object|null} value
*/
_setValue: function( value ) {
+ if( this._snakType && this._variation ) {
+ this._cachedValues[this._snakType] =
this._variation.value();
+ }
+
value = value || {};
this._propertyId = value.property || null;
@@ -575,6 +588,11 @@
this.draw();
},
+ /**
+ * Updates specifics of the value.
+ *
+ * @param {Object} changes
+ */
_updateValue: function( changes ) {
this._setValue( $.extend( this._getValue(), changes ) );
},
@@ -585,8 +603,8 @@
*
* @since 0.4
*
- * @param {wb.datamodel.Snak|null} [snak]
- * @return wb.datamodel.Snak|null
+ * @param {wikibase.datamodel.Snak|null} [snak]
+ * @return {wikibase.datamodel.Snak|null}
*/
snak: function( snak ) {
if( snak === undefined ) {
@@ -647,9 +665,15 @@
}
if( snakType !== this._snakType ) {
// TODO: check whether given snak type is actually
valid!
- this._updateValue( {
+ var changes = {
snaktype: snakType
- } );
+ };
+
+ if( this._cachedValues[snakType] ) {
+ $.extend( changes, this._cachedValues[snakType]
);
+ }
+
+ this._updateValue( changes );
}
},
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.toolbar.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.toolbar.js
index 9443254..6f2f3fa 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.toolbar.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/toolbar/jquery.wikibase.toolbar.js
@@ -131,7 +131,7 @@
} );
if( this.options.renderItemSeparators &&
this.options.$content.length ) {
- $container.append( mw.template(
'wikibase-toolbar-bracketed', $children ) );
+ $container.append( mw.wbTemplate(
'wikibase-toolbar-bracketed', $children ) );
} else {
$container.append( $children );
}
diff --git a/extensions/Wikibase/lib/resources/templates.js
b/extensions/Wikibase/lib/resources/templates.js
index c06d19b..f7b7873 100644
--- a/extensions/Wikibase/lib/resources/templates.js
+++ b/extensions/Wikibase/lib/resources/templates.js
@@ -2,7 +2,6 @@
* @licence GNU GPL v2+
* @author H. Snater < [email protected] >
*/
-
( function( mw, $ ) {
'use strict';
@@ -17,11 +16,11 @@
*
* @constructor
*/
- mw.Template = function() { mw.Message.apply( this, arguments ); };
- mw.Template.prototype = $.extend(
+ mw.WbTemplate = function() { mw.Message.apply( this, arguments ); };
+ mw.WbTemplate.prototype = $.extend(
{},
mw.Message.prototype,
- { constructor: mw.Template }
+ { constructor: mw.WbTemplate }
);
/**
@@ -31,7 +30,7 @@
*
* @return {string}
*/
- mw.Template.prototype.plain = function() {
+ mw.WbTemplate.prototype.plain = function() {
return this.parser();
};
@@ -40,7 +39,7 @@
*
* @return {string}
*/
- mw.Template.prototype.parser = function () {
+ mw.WbTemplate.prototype.parser = function () {
var parameters = this.parameters;
return this.map.get( this.key ).replace( /\$(\d+)/g, function (
str, match ) {
var index = parseInt( match, 10 ) - 1;
@@ -62,7 +61,7 @@
*
* @throws {Error} if the generated template's HTML is invalid.
*/
- mw.template = function( key, parameter1 /* [, parameter2[, ...]] */ ) {
+ mw.wbTemplate = function( key, parameter1 /* [, parameter2[, ...]] */ )
{
var i,
params = [],
template,
@@ -94,11 +93,11 @@
tempParams.push( '<' + nodeName + '
class="--mwTemplate"></' + nodeName + '>' );
delayedParams.push( params[i] );
} else {
- throw new Error( 'mw.template: Wrong parameter
type. Pass either String or jQuery.' );
+ throw new Error( 'mw.WbTemplate: Wrong
parameter type. Pass either String or jQuery.' );
}
}
- template = new mw.Template( mw.templates.store, key, tempParams
);
+ template = new mw.WbTemplate( mw.wbTemplates.store, key,
tempParams );
// Wrap template inside a html container to be able to easily
access all temporary nodes and
// insert any jQuery objects:
@@ -106,8 +105,8 @@
if( !areCachedParameterTypes( key, params ) ) {
if( !isValidHtml( template, $wrappedTemplate ) ) {
- throw new Error( 'mw.template: Tried to
generate invalid HTML for template "' + key
- + '"' );
+ throw new Error( 'mw.wbTemplate: Tried to
generate invalid HTML for template "'
+ + key + '"' );
}
addToCache( key, params );
}
@@ -137,7 +136,7 @@
* @return {jQuery}
*/
$.fn.applyTemplate = function( template, parameter1 /*[, parameter2[,
...]] */ ) {
- var $template = mw.template.apply( null, arguments );
+ var $template = mw.wbTemplate.apply( null, arguments );
if( $template.length !== 1 ) {
throw new Error( 'Can not apply a template with more or
less than one root node.' );
diff --git a/extensions/Wikibase/lib/tests/qunit/templates.tests.js
b/extensions/Wikibase/lib/tests/qunit/templates.tests.js
index cb9c7d5..e416e7d 100644
--- a/extensions/Wikibase/lib/tests/qunit/templates.tests.js
+++ b/extensions/Wikibase/lib/tests/qunit/templates.tests.js
@@ -8,17 +8,17 @@
* @author H. Snater < [email protected] >
*/
-( function( mw, $, QUnit, undefined ) {
+( function( mw, $, QUnit ) {
'use strict';
QUnit.module( 'templates', QUnit.newMwEnvironment() );
- QUnit.test( 'mw.template()', function( assert ) {
+ QUnit.test( 'mw.wbTemplate()', function( assert ) {
assert.equal(
- typeof mw.templates,
+ typeof mw.wbTemplates,
'object',
- 'mw.templates is defined.'
+ 'mw.wbTemplates is defined.'
);
/**
@@ -153,7 +153,7 @@
];
/**
- * Verifies if mw.template() delivers an expected result.
+ * Verifies if mw.wbTemplate() delivers an expected result.
*
* @param {Array} params
* @param {String} template
@@ -181,7 +181,7 @@
params = [ params ];
}
- mw.templates.store.set( key, template );
+ mw.wbTemplates.store.set( key, template );
var paramMessage = '';
$.each( params, function( i, param ) {
@@ -201,12 +201,12 @@
if ( expected === '' ) {
assert.throws(
- function() { $( '<div/>' ).append(
mw.template( key, params ) ).html(); },
+ function() { $( '<div/>' ).append(
mw.wbTemplate( key, params ) ).html(); },
'Triggered error when trying to create
invalid HTML filling single param template "' + template + '" with "' +
paramMessage + '"'
);
} else {
assert.equal(
- replaceChevrons( $( '<div/>' ).append(
mw.template( key, params ) ).html() ),
+ replaceChevrons( $( '<div/>' ).append(
mw.wbTemplate( key, params ) ).html() ),
replaceChevrons( expected ),
'Verified template: "' + template + '"
with "' + paramMessage + '"'
);
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 0d07059..7cbbcbe 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit83e199c0f18e266d5f80f20dd4343ecc::getLoader();
+return ComposerAutoloaderInitb059298dd63f151d018206065015420b::getLoader();
diff --git a/vendor/composer/autoload_real.php
b/vendor/composer/autoload_real.php
index d11336e..cc63abc 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit83e199c0f18e266d5f80f20dd4343ecc
+class ComposerAutoloaderInitb059298dd63f151d018206065015420b
{
private static $loader;
@@ -19,9 +19,9 @@
return self::$loader;
}
-
spl_autoload_register(array('ComposerAutoloaderInit83e199c0f18e266d5f80f20dd4343ecc',
'loadClassLoader'), true, true);
+
spl_autoload_register(array('ComposerAutoloaderInitb059298dd63f151d018206065015420b',
'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInit83e199c0f18e266d5f80f20dd4343ecc',
'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInitb059298dd63f151d018206065015420b',
'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) {
- composerRequire83e199c0f18e266d5f80f20dd4343ecc($file);
+ composerRequireb059298dd63f151d018206065015420b($file);
}
return $loader;
}
}
-function composerRequire83e199c0f18e266d5f80f20dd4343ecc($file)
+function composerRequireb059298dd63f151d018206065015420b($file)
{
require $file;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 4eff9ce..6d9f2f4 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": "3e5ecbf1d8eef4fc4f8f2ff70fd211e08d855eb4"
+ "reference": "3f2174db470060a656a57674a0456a8c61196b00"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/3e5ecbf1d8eef4fc4f8f2ff70fd211e08d855eb4";,
- "reference": "3e5ecbf1d8eef4fc4f8f2ff70fd211e08d855eb4",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/3f2174db470060a656a57674a0456a8c61196b00";,
+ "reference": "3f2174db470060a656a57674a0456a8c61196b00",
"shasum": ""
},
"require": {
@@ -1177,7 +1177,7 @@
"conflict": {
"mediawiki/mediawiki": "<1.23"
},
- "time": "2014-10-29 22:42:41",
+ "time": "2014-10-30 14:10:33",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/170034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib28b87d47017af75837387340c47dbe27b7c7e49
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: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
