jenkins-bot has submitted this change and it was merged.
Change subject: Don't remove and re-add list items on save
......................................................................
Don't remove and re-add list items on save
Change-Id: I89d0a35f53ec14e24f03490b2a36a9cc02ef5c33
---
M view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js
M view/resources/jquery/wikibase/jquery.wikibase.statementlistview.js
M view/resources/jquery/wikibase/jquery.wikibase.statementview.js
M view/tests/qunit/jquery/wikibase/jquery.wikibase.statementview.tests.js
4 files changed, 5 insertions(+), 48 deletions(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, but someone else must approve
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js
b/view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js
index c3108b7..d07894d 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.sitelinklistview.js
@@ -765,17 +765,7 @@
$sitelinkview
.addClass( 'wb-new' )
.on( afterStopEditingEvent, function( event, dropValue
) {
- var siteLink = sitelinkview.value();
-
- listview.removeItem( $sitelinkview );
-
- if ( !dropValue && siteLink ) {
- listview.addItem( siteLink );
- }
-
- if ( self.__pendingItems &&
--self.__pendingItems !== 0 ) {
- return;
- }
+ $sitelinkview.removeClass( 'wb-new' );
self._refreshCounter();
} );
@@ -788,7 +778,6 @@
sitelinkview.startEditing();
}
- self.__pendingItems = self.__pendingItems ?
self.__pendingItems + 1 : 1;
self._trigger( 'change' );
} );
}
diff --git
a/view/resources/jquery/wikibase/jquery.wikibase.statementlistview.js
b/view/resources/jquery/wikibase/jquery.wikibase.statementlistview.js
index 8e2e008..f682a5e 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.statementlistview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.statementlistview.js
@@ -201,14 +201,7 @@
$statementview
.addClass( 'wb-new' )
.one( afterStopEditingEvent, function( event, dropValue
) {
- var statement = statementview.value();
-
- self._listview.removeItem( $statementview );
-
- if ( !dropValue && statement ) {
- self._listview.addItem( statement );
- }
-
+ $statementview.removeClass( 'wb-new' );
self._trigger( 'afterstopediting', null,
[dropValue] );
} );
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
index 51edd7d..d4e2ba0 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.statementview.js
@@ -355,22 +355,6 @@
liInstance.enterNewItem();
self._drawReferencesCounter();
self._trigger( 'change' );
-
- if ( !liInstance.value() ) {
- $newLi
- .on( lia.prefixedEvent( 'afterstopediting' ),
function( event, dropValue ) {
- if ( !dropValue ) {
- var newReferenceWithHash =
liInstance.value();
-
- // Destroy new reference input
form and add reference to list
- liInstance.destroy();
- $newLi.remove();
-
- // Display new reference with
final GUID
- self._addReference(
newReferenceWithHash );
- }
- } );
- }
} );
this._createReferencesToggler();
@@ -562,17 +546,6 @@
this._getReferences(),
this._rankSelector.value()
);
- },
-
- /**
- * Adds a `Reference` and renders it in the view.
- *
- * @private
- *
- * @param {wikibase.datamodel.Reference} reference
- */
- _addReference: function( reference ) {
- this._referencesListview.addItem( reference );
},
/**
diff --git
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.statementview.tests.js
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.statementview.tests.js
index 3b83220..1be9b34 100644
--- a/view/tests/qunit/jquery/wikibase/jquery.wikibase.statementview.tests.js
+++ b/view/tests/qunit/jquery/wikibase/jquery.wikibase.statementview.tests.js
@@ -39,6 +39,8 @@
this.isValid = function() {
return true;
};
+ this.enterNewItem = function() {
+ };
}
);
},
@@ -207,7 +209,7 @@
QUnit.stop();
statementview.startEditing().done( function() {
QUnit.start();
- statementview._addReference( null );
+ statementview._referencesListview.enterNewItem();
assert.ok( statementview.value(), 'value should return a value'
);
} );
} );
--
To view, visit https://gerrit.wikimedia.org/r/297359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I89d0a35f53ec14e24f03490b2a36a9cc02ef5c33
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Heine <[email protected]>
Gerrit-Reviewer: Adrian Heine <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[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
