[MediaWiki-commits] [Gerrit] Adapt to new JavaScript datamodel and serialization - change (mediawiki...Wikibase)

2014-11-07 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Adapt to new JavaScript datamodel and serialization
..


Adapt to new JavaScript datamodel and serialization

Needs
* https://github.com/wmde/WikibaseDataModelJavascript/pull/16
* https://github.com/wmde/WikibaseSerializationJavaScript/pull/6

Bug: 72757
Change-Id: Iafc2ed96df9f4a36b87ea9217eddc653fd3c4b9c
---
M composer.json
M lib/resources/entityChangers/AliasesChanger.js
M lib/resources/entityChangers/ClaimsChanger.js
M lib/resources/entityChangers/EntityChangersFactory.js
M lib/resources/entityChangers/ReferencesChanger.js
M lib/resources/entityChangers/resources.php
M lib/resources/jquery.wikibase/jquery.wikibase.badgeselector.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M lib/resources/jquery.wikibase/snakview/resources.php
M lib/resources/jquery.wikibase/snakview/snakview.js
M lib/resources/jquery.wikibase/snakview/snakview.variations.Value.js
M lib/resources/wikibase.store/resources.php
M lib/resources/wikibase.store/store.ApiEntityStore.js
M lib/resources/wikibase.store/store.FetchedContentUnserializer.js
M lib/resources/wikibase.store/store.MwConfigEntityStore.js
M lib/resources/wikibase.utilities/wikibase.utilities.ui.js
M lib/tests/qunit/entityChangers/AliasesChanger.tests.js
M lib/tests/qunit/entityChangers/ClaimsChanger.tests.js
M lib/tests/qunit/entityChangers/DescriptionsChanger.tests.js
M lib/tests/qunit/entityChangers/LabelsChanger.tests.js
M lib/tests/qunit/entityChangers/ReferencesChanger.tests.js
M lib/tests/qunit/entityChangers/SiteLinksChanger.tests.js
M lib/tests/qunit/entityChangers/resources.php
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.badgeselector.tests.js
A lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimgrouplistview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.referenceview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.snaklistview.tests.js
M lib/tests/qunit/jquery.wikibase/resources.php
M lib/tests/qunit/wikibase.store/store.MwConfigEntityStore.tests.js
M repo/resources/Resources.php
M repo/resources/wikibase.EntityInitializer.js
M repo/resources/wikibase.ui.entityViewInit.js
40 files changed, 785 insertions(+), 265 deletions(-)

Approvals:
  Tobias Gritschacher: Verified; Looks good to me, but someone else must approve
  Henning Snater: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index 4d0c0b2..1f70d8d 100644
--- a/composer.json
+++ b/composer.json
@@ -36,10 +36,10 @@
data-values/value-view: ~0.8.0,
 
wikibase/data-model: ~2.0,
-   wikibase/data-model-javascript: ~0.3.0,
+   wikibase/data-model-javascript: ~1.0,
wikibase/data-model-serialization: ~1.2,
wikibase/internal-serialization: ~1.3,
-   wikibase/serialization-javascript: ~1.1.1,
+   wikibase/serialization-javascript: ~2.0,
 
diff/diff: ~1.0,
wikibase/easyrdf_lite: ~0.8.1
diff --git a/lib/resources/entityChangers/AliasesChanger.js 
b/lib/resources/entityChangers/AliasesChanger.js
index 8a0466a..ac32909 100644
--- a/lib/resources/entityChangers/AliasesChanger.js
+++ b/lib/resources/entityChangers/AliasesChanger.js
@@ -38,7 +38,7 @@
_api: null,
 
/**
-* @param {Object[]} aliases
+* @param {string[]} aliases
 * @param {string} language
 * @return {jQuery.Promise}
 * No resolved parameters.
@@ -47,21 +47,23 @@
 */
setAliases: function( aliases, language ) {
var deferred = $.Deferred(),
-   self = this;
+   self = this,
+   initialAliases = this._getInitialAliases( language );
 
this._api.setAliases(
this._entity.getId(),
this._revisionStore.getAliasesRevision(),
-   this._getNewAliases( aliases, language ),
-   this._getRemovedAliases( aliases, language ),
+   this._getNewAliases( aliases, initialAliases ),
+   this._getRemovedAliases( aliases, initialAliases ),
language
)
.done( function( response ) {

[MediaWiki-commits] [Gerrit] Adapt to new JavaScript datamodel and serialization - change (mediawiki...Wikibase)

2014-10-17 Thread Adrian Lang (Code Review) 
Adrian Lang has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/167206

Change subject: Adapt to new JavaScript datamodel and serialization
..

Adapt to new JavaScript datamodel and serialization

Needs
* https://github.com/wmde/WikibaseDataModelJavascript/pull/16
* https://github.com/wmde/WikibaseSerializationJavaScript/pull/6

Change-Id: Iafc2ed96df9f4a36b87ea9217eddc653fd3c4b9c
---
M composer.json
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
M lib/resources/jquery.wikibase/snakview/resources.php
M lib/resources/jquery.wikibase/snakview/snakview.js
M lib/resources/jquery.wikibase/snakview/snakview.variations.Value.js
M lib/resources/wikibase.store/resources.php
M lib/resources/wikibase.store/store.FetchedContentUnserializer.js
M lib/resources/wikibase.utilities/wikibase.utilities.ui.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.badgeselector.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.referenceview.tests.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.snaklistview.tests.js
M repo/resources/Resources.php
M repo/resources/wikibase.EntityInitializer.js
M repo/resources/wikibase.ui.entityViewInit.js
17 files changed, 98 insertions(+), 95 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/06/167206/1

diff --git a/composer.json b/composer.json
index 76f3ed2..738eeda 100644
--- a/composer.json
+++ b/composer.json
@@ -36,10 +36,10 @@
data-values/value-view: ~0.7.0,
 
wikibase/data-model: ~2.0,
-   wikibase/data-model-javascript: ~0.3.0,
+   wikibase/data-model-javascript: ~1.0.0,
wikibase/data-model-serialization: ~1.2,
wikibase/internal-serialization: ~1.3,
-   wikibase/serialization-javascript: ~1.1.1,
+   wikibase/serialization-javascript: ~2.0.0,
 
diff/diff: ~1.0,
wikibase/easyrdf_lite: ~0.8.1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
index 1272bd6..307c8f7 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
@@ -124,7 +124,7 @@
label: this.$label.hasClass( 'wb-empty' )
? null
// FIXME: entity object should not 
contain fallback strings
-   : this.options.value.getLabel( 
mw.config.get( 'wgUserLanguage' ) )
+   : 
this.options.value.getFingerprint().getLabelFor( mw.config.get( 
'wgUserLanguage' ) )
},
helpMessage: mw.msg(
'wikibase-description-input-help-message',
@@ -148,7 +148,7 @@
description: this.$description.hasClass( 
'wb-empty' )
? null
// FIXME: entity object should not 
contain fallback strings
-   : this.options.value.getDescription( 
mw.config.get( 'wgUserLanguage' ) )
+   : 
this.options.value.getFingerprint().getDescriptionFor( mw.config.get( 
'wgUserLanguage' ) )
},
helpMessage: mw.msg(
'wikibase-description-input-help-message',
@@ -168,7 +168,7 @@
this.$aliases.aliasesview( {
value: {
language:  mw.config.get( 'wgUserLanguage' ),
-   aliases: this.options.value.getAliases( 
mw.config.get( 'wgUserLanguage' ) )
+   aliases: 
this.options.value.getFingerprint().getAliasesFor( mw.config.get( 
'wgUserLanguage' ) )
},
entityId: this.options.value.getId(),
api: this.options.api
@@ -224,7 +224,7 @@
 
this.$claims
.claimgrouplistview( {
-   value: this.options.value.getClaims(),
+   value: this.options.value.getStatements(),
entityType: this.options.value.getType(),
entityStore: this.options.entityStore,
valueViewBuilder: this.options.valueViewBuilder,
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
index f0af262..39a9812 100644
---