Skip to content

Commit

Permalink
Rev for 1.2.9 release
Browse files Browse the repository at this point in the history
  • Loading branch information
Tomas Kirda committed Nov 24, 2013
1 parent 6dad728 commit 4924da0
Show file tree
Hide file tree
Showing 4 changed files with 114 additions and 57 deletions.
2 changes: 1 addition & 1 deletion devbridge-autocomplete.jquery.json
View file
Expand Up @@ -6,7 +6,7 @@
"ajax",
"autocomplete"
],
"version": "1.2.8",
"version": "1.2.9",
"author": {
"name": "Tomas Kirda",
"url": "https://github.com/tkirda"
Expand Down
124 changes: 90 additions & 34 deletions dist/jquery.autocomplete.js
View file
@@ -1,5 +1,5 @@
/**
* Ajax Autocomplete for jQuery, version 1.2.8
* Ajax Autocomplete for jQuery, version 1.2.9
* (c) 2013 Tomas Kirda
*
* Ajax Autocomplete for jQuery is freely distributable under the terms of an MIT-style license.
Expand Down Expand Up @@ -75,6 +75,7 @@
tabDisabled: false,
dataType: 'text',
currentRequest: null,
triggerSelectOnValidInput: true,
lookupFilter: function (suggestion, originalQuery, queryLowerCase) {
return suggestion.value.toLowerCase().indexOf(queryLowerCase) !== -1;
},
Expand All @@ -92,7 +93,7 @@
that.selectedIndex = -1;
that.currentValue = that.element.value;
that.intervalId = 0;
that.cachedResponse = [];
that.cachedResponse = {};
that.onChangeInterval = null;
that.onChange = null;
that.isLocal = false;
Expand Down Expand Up @@ -219,7 +220,7 @@
},

clearCache: function () {
this.cachedResponse = [];
this.cachedResponse = {};
this.badQueries = [];
},

Expand Down Expand Up @@ -390,80 +391,123 @@

onValueChange: function () {
var that = this,
q;
options = that.options,
value = that.el.val(),
query = that.getQuery(value),
index;

if (that.selection) {
that.selection = null;
(that.options.onInvalidateSelection || $.noop)();
(options.onInvalidateSelection || $.noop).call(that.element);
}

clearInterval(that.onChangeInterval);
that.currentValue = that.el.val();

q = that.getQuery(that.currentValue);
that.currentValue = value;
that.selectedIndex = -1;

if (q.length < that.options.minChars) {
// Check existing suggestion for the match before proceeding:
if (options.triggerSelectOnValidInput) {
index = that.findSuggestionIndex(query);
if (index !== -1) {
that.select(index);
return;
}
}

if (query.length < options.minChars) {
that.hide();
} else {
that.getSuggestions(q);
that.getSuggestions(query);
}
},

findSuggestionIndex: function (query) {
var that = this,
index = -1,
queryLowerCase = query.toLowerCase();

$.each(that.suggestions, function (i, suggestion) {
if (suggestion.value.toLowerCase() === queryLowerCase) {
index = i;
return false;
}
});

return index;
},

getQuery: function (value) {
var delimiter = this.options.delimiter,
parts;

if (!delimiter) {
return $.trim(value);
return value;
}
parts = value.split(delimiter);
return $.trim(parts[parts.length - 1]);
},

getSuggestionsLocal: function (query) {
var that = this,
options = that.options,
queryLowerCase = query.toLowerCase(),
filter = that.options.lookupFilter;
filter = options.lookupFilter,
limit = parseInt(options.lookupLimit, 10),
data;

return {
suggestions: $.grep(that.options.lookup, function (suggestion) {
data = {
suggestions: $.grep(options.lookup, function (suggestion) {
return filter(suggestion, query, queryLowerCase);
})
};

if (limit && data.suggestions.length > limit) {
data.suggestions = data.suggestions.slice(0, limit);
}

return data;
},

getSuggestions: function (q) {
var response,
that = this,
options = that.options,
serviceUrl = options.serviceUrl;
serviceUrl = options.serviceUrl,
data,
cacheKey;

response = that.isLocal ? that.getSuggestionsLocal(q) : that.cachedResponse[q];
options.params[options.paramName] = q;
data = options.ignoreParams ? null : options.params;

if (that.isLocal) {
response = that.getSuggestionsLocal(q);
} else {
if ($.isFunction(serviceUrl)) {
serviceUrl = serviceUrl.call(that.element, q);
}
cacheKey = serviceUrl + '?' + $.param(data || {});
response = that.cachedResponse[cacheKey];
}

if (response && $.isArray(response.suggestions)) {
that.suggestions = response.suggestions;
that.suggest();
} else if (!that.isBadQuery(q)) {
options.params[options.paramName] = q;
if (options.onSearchStart.call(that.element, options.params) === false) {
return;
}
if ($.isFunction(options.serviceUrl)) {
serviceUrl = options.serviceUrl.call(that.element, q);
}
if (that.currentRequest) {
that.currentRequest.abort();
}
that.currentRequest = $.ajax({
url: serviceUrl,
data: options.ignoreParams ? null : options.params,
data: data,
type: options.type,
dataType: options.dataType
}).done(function (data) {
that.currentRequest = null;
that.processResponse(data, q);
options.onSearchComplete.call(that.element, q, data);
that.processResponse(data, q, cacheKey);
options.onSearchComplete.call(that.element, q);
}).fail(function (jqXHR, textStatus, errorThrown) {
options.onSearchError.call(that.element, q, jqXHR, textStatus, errorThrown);
});
Expand Down Expand Up @@ -498,15 +542,25 @@
}

var that = this,
formatResult = that.options.formatResult,
options = that.options,
formatResult = options.formatResult,
value = that.getQuery(that.currentValue),
className = that.classes.suggestion,
classSelected = that.classes.selected,
container = $(that.suggestionsContainer),
beforeRender = that.options.beforeRender,
beforeRender = options.beforeRender,
html = '',
index,
width;

if (options.triggerSelectOnValidInput) {
index = that.findSuggestionIndex(value);
if (index !== -1) {
that.select(index);
return;
}
}

// Build suggestions inner HTML:
$.each(that.suggestions, function (i, suggestion) {
html += '<div class="' + className + '" data-index="' + i + '">' + formatResult(suggestion, value) + '</div>';
Expand All @@ -516,15 +570,15 @@
// because if instance was created before input had width, it will be zero.
// Also it adjusts if input width has changed.
// -2px to account for suggestions border.
if (that.options.width === 'auto') {
if (options.width === 'auto') {
width = that.el.outerWidth() - 2;
container.width(width > 0 ? width : 300);
}

container.html(html);

// Select first value by default:
if (that.options.autoSelectFirst) {
if (options.autoSelectFirst) {
that.selectedIndex = 0;
container.children().first().addClass(classSelected);
}
Expand Down Expand Up @@ -583,7 +637,7 @@
return suggestions;
},

processResponse: function (response, originalQuery) {
processResponse: function (response, originalQuery, cacheKey) {
var that = this,
options = that.options,
result = options.transformResult(response, originalQuery);
Expand All @@ -592,17 +646,19 @@

// Cache results if cache is not disabled:
if (!options.noCache) {
that.cachedResponse[result[options.paramName]] = result;
that.cachedResponse[cacheKey] = result;
if (result.suggestions.length === 0) {
that.badQueries.push(result[options.paramName]);
that.badQueries.push(cacheKey);
}
}

// Display suggestions only if returned query matches current value:
if (originalQuery === that.getQuery(that.currentValue)) {
that.suggestions = result.suggestions;
that.suggest();
// Return if originalQuery is not matching current query:
if (originalQuery !== that.getQuery(that.currentValue)) {
return;
}

that.suggestions = result.suggestions;
that.suggest();
},

activate: function (index) {
Expand Down

0 comments on commit 4924da0

Please sign in to comment.