jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354265 )
Change subject: Statement list on newly added form
......................................................................
Statement list on newly added form
Bug: T165481
Change-Id: Ic9bd6d095bdda10108ec9f991228844d45936774
---
M extension.json
M resources/jquery.wikibase.lexemeformview.js
M resources/view/ControllerViewFactory.js
3 files changed, 29 insertions(+), 7 deletions(-)
Approvals:
WMDE-leszek: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index f1af2e0..0d8935a 100644
--- a/extension.json
+++ b/extension.json
@@ -77,7 +77,8 @@
],
"messages": [
"wikibase-lexeme-empty-form-representation",
- "wikibase-lexeme-enter-form-representation"
+ "wikibase-lexeme-enter-form-representation",
+ "wikibase-statementsection-statements"
]
},
"jquery.wikibase.grammaticalfeatureview": {
diff --git a/resources/jquery.wikibase.lexemeformview.js
b/resources/jquery.wikibase.lexemeformview.js
index 54bd622..10fcd42 100644
--- a/resources/jquery.wikibase.lexemeformview.js
+++ b/resources/jquery.wikibase.lexemeformview.js
@@ -34,7 +34,23 @@
function () {
return mw.wbTemplate(
'wikibase-lexeme-form-grammatical-features', '' );
},
- 'Statements\' section will be here' //TODO find
way to render block of statements
+ function () {
+ var $container = $( '<div/>' ),
+ $header = $( '<h2/>'
).applyTemplate(
+ 'wb-section-heading',
+ [
+ mw.message(
'wikibase-statementsection-statements' ).escaped(),
+ '',
+ 'wikibase-statements'
+ ]
+ );
+ $container.append( $header );
+
+ this.$statements = $( '<div/>' );
+ $container.append( this.$statements );
+
+ return $container;
+ }
],
templateShortCuts: {
$text: '.wikibase-lexeme-form-text',
@@ -42,7 +58,7 @@
$grammaticalFeatures:
'.wikibase-lexeme-form-grammatical-features'
},
inputNodeName: 'TEXTAREA',
- buildGrammaticalFeatureView: null,
+ api: null,
/**
* @type {buildStatementGroupListView}
@@ -65,6 +81,7 @@
if ( value instanceof
wikibase.lexeme.datamodel.LexemeForm ) {
this.option( 'value', value );
this._grammaticalFeatureView.value(
value.getGrammaticalFeatures() );
+ this.draw();
return;
}
@@ -73,7 +90,7 @@
}
return new wikibase.lexeme.datamodel.LexemeForm(
- Math.round( Math.random() * 100 ), // TODO:
should be a unique numeric ID per form
+ null,
$.trim( this.$text.children( this.inputNodeName
).val() ),
this._grammaticalFeatureView ?
this._grammaticalFeatureView.value() : []
);
@@ -83,9 +100,10 @@
PARENT.prototype._create.call( this );
this._grammaticalFeatureView =
this._buildGrammaticalFeatureView();
+ var $statements = this.$statements || $(
'.wikibase-statementgrouplistview', this.element );
this.options.buildStatementGroupListView(
this.value(),
- $( '.wikibase-statementgrouplistview',
this.element )
+ $statements
);
},
diff --git a/resources/view/ControllerViewFactory.js
b/resources/view/ControllerViewFactory.js
index 4c8ea30..aca7c71 100644
--- a/resources/view/ControllerViewFactory.js
+++ b/resources/view/ControllerViewFactory.js
@@ -75,9 +75,12 @@
};
var fakeModel = { // FIXME: replace with EntityChanger
- save: function ( value ) {
+ save: function ( form ) {
var deferred = $.Deferred();
- deferred.resolve( value );
+ if ( !form.getId() ) {
+ form._id = Math.round( Math.random() * 100 );
+ }
+ deferred.resolve( form );
return deferred.promise();
}
};
--
To view, visit https://gerrit.wikimedia.org/r/354265
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9bd6d095bdda10108ec9f991228844d45936774
Gerrit-PatchSet: 19
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Aleksey Bekh-Ivanov (WMDE) <[email protected]>
Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) <[email protected]>
Gerrit-Reviewer: Jakob <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: WMDE-leszek <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
