jenkins-bot has submitted this change and it was merged.
Change subject: Pass removeCallback to getStatementView
......................................................................
Pass removeCallback to getStatementView
Change-Id: I4788ab39792fb467a5e83aa612a755e330c9700c
---
M view/resources/wikibase/view/ControllerViewFactory.js
M view/resources/wikibase/view/ViewFactory.js
2 files changed, 12 insertions(+), 15 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/view/resources/wikibase/view/ControllerViewFactory.js
b/view/resources/wikibase/view/ControllerViewFactory.js
index 3a1115e..6d34ba1 100644
--- a/view/resources/wikibase/view/ControllerViewFactory.js
+++ b/view/resources/wikibase/view/ControllerViewFactory.js
@@ -75,7 +75,7 @@
return view;
};
-SELF.prototype.getStatementView = function( startEditingCallback, entityId,
propertyId, value, $dom ) {
+SELF.prototype.getStatementView = function( startEditingCallback, entityId,
propertyId, removeCallback, value, $dom ) {
var controller;
var startEditingController = function() {
return controller.startEditing();
@@ -89,20 +89,12 @@
$dom
);
- var removeFromListView = function( statementview ) {
- var $statementlistview = statementview.element.closest(
':wikibase-statementlistview' ),
- statementlistview = $statementlistview.data(
'statementlistview' );
- if ( statementlistview ) {
- statementlistview.remove( statementview );
- }
- };
-
var statementsChanger =
this._entityChangersFactory.getStatementsChanger();
controller = this._getController(
this._toolbarFactory.getToolbarContainer( statementview.element
),
statementview,
statementsChanger,
- removeFromListView.bind( null, statementview ),
+ removeCallback.bind( null, statementview ),
value,
startEditingCallback
);
diff --git a/view/resources/wikibase/view/ViewFactory.js
b/view/resources/wikibase/view/ViewFactory.js
index 4e33749..6117cfa 100644
--- a/view/resources/wikibase/view/ViewFactory.js
+++ b/view/resources/wikibase/view/ViewFactory.js
@@ -360,7 +360,8 @@
SELF.prototype.getStatementListView = function( startEditingCallback,
entityId, propertyId, getStatementForGuid, value, $statementlistview ) {
propertyId = propertyId || $statementlistview.closest(
'.wikibase-statementgroupview' ).attr( 'id' );
- return this._getView(
+ var statementlistview;
+ statementlistview = this._getView(
'statementlistview',
$statementlistview,
{
@@ -372,10 +373,14 @@
var guidMatch =
dom.className.match( /wikibase-statement-(\S+)/ );
return guidMatch ?
getStatementForGuid( guidMatch[ 1 ] ) : null;
},
- propertyId
+ propertyId,
+ function( statementview ) {
+ return
statementlistview.remove( statementview );
+ }
)
}
);
+ return statementlistview;
};
/**
@@ -388,19 +393,19 @@
* @param {string|null} [propertyId] Optionally a property all
statements are or should be on
* @return {jQuery.wikibase.listview.ListItemAdapter} The constructed
ListItemAdapter
**/
- SELF.prototype.getListItemAdapterForStatementView = function(
startEditingCallback, entityId, getValueForDom, propertyId ) {
+ SELF.prototype.getListItemAdapterForStatementView = function(
startEditingCallback, entityId, getValueForDom, propertyId, removeCallback ) {
var listItemAdapter = new $.wikibase.listview.ListItemAdapter( {
listItemWidget: $.wikibase.statementview,
getNewItem: $.proxy( function( value, dom ) {
value = value || getValueForDom( dom );
- var view = this.getStatementView(
startEditingCallback, entityId, propertyId, value, $( dom ) );
+ var view = this.getStatementView(
startEditingCallback, entityId, propertyId, removeCallback, value, $( dom ) );
return view;
}, this )
} );
return listItemAdapter;
};
- SELF.prototype.getStatementView = function( startEditingCallback,
entityId, propertyId, value, $dom ) {
+ SELF.prototype.getStatementView = function( startEditingCallback,
entityId, propertyId, removeCallback, value, $dom ) {
var structureEditorFactory = this._structureEditorFactory;
var currentPropertyId = value ?
value.getClaim().getMainSnak().getPropertyId() : propertyId;
var view = this._getView(
--
To view, visit https://gerrit.wikimedia.org/r/298758
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4788ab39792fb467a5e83aa612a755e330c9700c
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Heine <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
