From 6362571659b84399a68f1546d94d8368d3777922 Mon Sep 17 00:00:00 2001 From: Anthony Pieter Holland Date: Wed, 4 Nov 2015 00:41:43 +0000 Subject: [PATCH] https://github.com/corejavascript/typeahead.js/issues/33 --- dist/typeahead.bundle.js | 8 ++------ dist/typeahead.jquery.js | 8 ++------ src/typeahead/typeahead.js | 12 ++---------- 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/dist/typeahead.bundle.js b/dist/typeahead.bundle.js index f32f548ab9..606f80f539 100644 --- a/dist/typeahead.bundle.js +++ b/dist/typeahead.bundle.js @@ -2182,14 +2182,10 @@ return false; }, autocomplete: function autocomplete($selectable) { - var query, data, isValid; - query = this.input.getQuery(); - data = this.menu.getSelectableData($selectable); - isValid = data && query !== data.val; - if (isValid && !this.eventBus.before("autocomplete", data.obj)) { + var data = this.menu.getSelectableData($selectable); + if (!this.eventBus.before("autocomplete", data.obj)) { this.input.setQuery(data.val); this.eventBus.trigger("autocomplete", data.obj); - return true; } return false; }, diff --git a/dist/typeahead.jquery.js b/dist/typeahead.jquery.js index ff7ffeacdf..153e1b3891 100644 --- a/dist/typeahead.jquery.js +++ b/dist/typeahead.jquery.js @@ -1259,14 +1259,10 @@ return false; }, autocomplete: function autocomplete($selectable) { - var query, data, isValid; - query = this.input.getQuery(); - data = this.menu.getSelectableData($selectable); - isValid = data && query !== data.val; - if (isValid && !this.eventBus.before("autocomplete", data.obj)) { + var data = this.menu.getSelectableData($selectable); + if (!this.eventBus.before("autocomplete", data.obj)) { this.input.setQuery(data.val); this.eventBus.trigger("autocomplete", data.obj); - return true; } return false; }, diff --git a/src/typeahead/typeahead.js b/src/typeahead/typeahead.js index f84078e611..58986353bb 100644 --- a/src/typeahead/typeahead.js +++ b/src/typeahead/typeahead.js @@ -361,20 +361,12 @@ var Typeahead = (function() { }, autocomplete: function autocomplete($selectable) { - var query, data, isValid; - - query = this.input.getQuery(); - data = this.menu.getSelectableData($selectable); - isValid = data && query !== data.val; + var data = this.menu.getSelectableData($selectable); - if (isValid && !this.eventBus.before('autocomplete', data.obj)) { + if (!this.eventBus.before('autocomplete', data.obj)) { this.input.setQuery(data.val); this.eventBus.trigger('autocomplete', data.obj); - - // return true if autocompletion succeeded - return true; } - return false; },