[MediaWiki-commits] [Gerrit] Don't automatically select entity's on alias match in suggester - change (mediawiki...Wikibase)

[Hoo man (Code Review)]

Hoo man has uploaded a new change for review.

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

Change subject: Don't automatically select entity's on alias match in suggester
......................................................................

Don't automatically select entity's on alias match in suggester

Bug: 66748
Change-Id: I7bbc1854aa893c8db9861eed156565434d43eb9b
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js
2 files changed, 11 insertions(+), 23 deletions(-)


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

diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js 
b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
index c2148d1..135ebc0 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
@@ -148,16 +148,11 @@
                                clearTimeout( self.__searching );
                                self.search( event )
                                .done( function( suggestions, requestTerm ) {
-                                       if( suggestions.length === 0 ) {
+                                       if( suggestions.length === 0 || 
self.element.val() !== requestTerm ) {
                                                return;
                                        }
 
-                                       var aliases = suggestions[0].aliases || 
[],
-                                               matchingLabel 
=suggestions[0].label === requestTerm;
-
-                                       if( self.element.val() === requestTerm
-                                               && ( matchingLabel || 
$.inArray( requestTerm, aliases ) !== -1 )
-                                       ) {
+                                       if( suggestions[0].label === 
requestTerm ) {
                                                self._select( suggestions[0] );
                                        }
                                } );
diff --git 
a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js 
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js
index 2fe4782..7df2270 100644
--- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js
+++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js
@@ -87,32 +87,25 @@
                $entitySelector.trigger( 'eachchange.entityselector' );
        } );
 
-       QUnit.test( 'Implicitly select entity by matching alias / 
selectedEntity()', 2, function( assert ) {
-               var $entitySelector = newTestEntitySelector(),
-                       entitySelector = $entitySelector.data( 'entityselector' 
);
+       QUnit.test( 'Don\'t implicitly select entity by matching alias / 
selectedEntity()', function( assert ) {
+               QUnit.expect( 0 );
+
+               var $entitySelector = newTestEntitySelector();
 
                $entitySelector.val( 'yz' );
 
                $entitySelector
                .one( 'entityselectorselected', function( event, id ) {
-                       assert.deepEqual(
-                               id,
-                               entityStubs[1].id,
-                               'Selected first entity.'
-                       );
-
-                       assert.deepEqual(
-                               entitySelector.selectedEntity(),
-                               entityStubs[1],
-                               'Verified selected entity using 
selectedEntity().'
-                       );
-
-                       QUnit.start();
+                       assert.ok( false, 'entity should not automatically be 
selected based on the alias' );
                } );
 
                QUnit.stop();
 
                $entitySelector.trigger( 'eachchange.entityselector' );
+
+               window.setTimeout( function() {
+                       QUnit.start();
+               }, 200 );
        } );
 
        QUnit.test( 'Item constructor', function( assert ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7bbc1854aa893c8db9861eed156565434d43eb9b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: mw1.24-wmf8
Gerrit-Owner: Hoo man <h...@online.de>
Gerrit-Reviewer: Adrian Lang <adrian.l...@wikimedia.de>

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