jenkins-bot has submitted this change and it was merged.

Change subject: (hotfix) claimview: Correctly rebuild qualifiers
......................................................................


(hotfix) claimview: Correctly rebuild qualifiers

Correctly rebuilding the qualifiers listview when leaving edit mode.

Change-Id: I771518dcb312928e4527509a75607f80591f1b22
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
1 file changed, 6 insertions(+), 3 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
index c1826a1..c53c3cc 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
@@ -469,9 +469,7 @@
                // the "add qualifier" toolbar.
                this._destroyQualifiersListView();
 
-               var hasInitialQualifiers = this._initialQualifiers.length > 0;
-
-               if( ( dropValue || !dropValue && this._qualifiers ) && 
hasInitialQualifiers ) {
+               if( this._initialQualifiers.length > 0 ) {
                        // Refill the qualifier listview with the initial (or 
new initial) qualifiers:
                        this._createQualifiersListview( this._initialQualifiers 
);
                }
@@ -721,6 +719,11 @@
                        var $target = $( event.target ),
                                $qualifiers = $target.closest( 
'.wb-claim-qualifiers' );
 
+                       if( $target.parent().get( 0 ) !== $qualifiers.get( 0 ) 
) {
+                               // Not the qualifiers main listview.
+                               return;
+                       }
+
                        if ( $qualifiers.data( 'addtoolbar' ) ) {
                                $qualifiers.data( 'addtoolbar' ).destroy();
                                $qualifiers.removeData( 'addtoolbar' );

-- 
To view, visit https://gerrit.wikimedia.org/r/89823
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I771518dcb312928e4527509a75607f80591f1b22
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater <henning.sna...@wikimedia.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to