Henning Snater has uploaded a new change for review.

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


Change subject: entityselector: Properly set value when selecting a suggestion
......................................................................

entityselector: Properly set value when selecting a suggestion

Setting the actual input element's value when selecting a suggestion to prevent
a reset via validateInput() which is issued via the blur event handler.

Change-Id: I9dcb711b049df4d252cb4165aec80f727477e13f
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
1 file changed, 4 insertions(+), 17 deletions(-)


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

diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
index 10cd9a8..7deca78 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
@@ -232,29 +232,16 @@
                        // is set already.
                        this.menu.element.on( 'mousedown.' + this.widgetName, 
function( event ) {
                                if ( $( event.target ).closest( 
'.ui-menu-item:not( .ui-suggester-custom )' ).length ) {
-                                       var item =
-                                               $( event.target ).closest( 
'.ui-menu-item' ).data( 'item.autocomplete' );
+                                       var $item = $( event.target ).closest( 
'.ui-menu-item' ),
+                                               item = $item.data( 
'item.autocomplete' );
+
+                                       self.element.val( item.value || item.id 
);
                                        self._setEntity( item );
 
                                        if ( self.options.emulateSearchBox ) {
                                                window.location.href = item.url;
                                        }
-
                                }
-                       } );
-
-                       // When focusing a menu item, replace the input value 
with entity id if the entity has
-                       // no label.
-                       var fnNativeMenuFocus = this.menu.option( 'focus' );
-                       this.menu.option( 'focus', function( event, ui ) {
-                               fnNativeMenuFocus( event, ui );
-
-                               var item = ui.item.data( 'item.autocomplete' );
-                               if ( !item.value && /^(mouse|key)/.test( 
event.originalEvent.type ) ) {
-                                       self.element.val( ui.item.data( 
'item.autocomplete' ).id );
-                               }
-
-                               self._setEntity( item );
                        } );
 
                        // Prevent native menu selected callback to alter the 
input value when the "selected"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9dcb711b049df4d252cb4165aec80f727477e13f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to