From 3023235768b2a8504951497a18f97b4c2ab6efb1 Mon Sep 17 00:00:00 2001 From: Tomas Kirda Date: Sun, 20 Jan 2013 18:53:04 -0600 Subject: [PATCH] Release v1.2.2 --- dist/jquery.autocomplete.js | 61 +++++++++++++++++++++++---------- dist/jquery.autocomplete.min.js | 35 +++++++++---------- src/jquery.autocomplete.js | 4 +-- 3 files changed, 61 insertions(+), 39 deletions(-) diff --git a/dist/jquery.autocomplete.js b/dist/jquery.autocomplete.js index dfb102e..9be1e6d 100644 --- a/dist/jquery.autocomplete.js +++ b/dist/jquery.autocomplete.js @@ -1,11 +1,10 @@ /** -* Ajax Autocomplete for jQuery, version 1.2.1 +* Ajax Autocomplete for jQuery, version 1.2.2 * (c) 2013 Tomas Kirda * * Ajax Autocomplete for jQuery is freely distributable under the terms of an MIT-style license. * For details, see the web site: http://www.devbridge.com/projects/autocomplete/jquery/ * -* Last Review: 01/15/2013 */ /*jslint browser: true, white: true, plusplus: true */ @@ -71,6 +70,8 @@ var noop = function () { }, that = this, defaults = { + autoSelectFirst: false, + appendTo: 'body', serviceUrl: null, lookup: null, onSelect: null, @@ -87,8 +88,13 @@ onSearchStart: noop, onSearchComplete: noop, containerClass: 'autocomplete-suggestions', + tabDisabled: false, lookupFilter: function (suggestion, originalQuery, queryLowerCase) { return suggestion.value.toLowerCase().indexOf(queryLowerCase) !== -1; + }, + paramName: 'query', + transformResult: function (response) { + return response.suggestions; } }; @@ -106,7 +112,7 @@ that.ignoreValueChange = false; that.isLocal = false; that.suggestionsContainer = null; - that.options = defaults; + that.options = $.extend({}, defaults, options); that.classes = { selected: 'autocomplete-selected', suggestion: 'autocomplete-suggestion' @@ -135,6 +141,8 @@ initialize: function () { var that = this, suggestionSelector = '.' + that.classes.suggestion, + selected = that.classes.selected, + options = that.options, container; // Remove autocomplete attribute to prevent native suggestions: @@ -148,21 +156,27 @@ }; // Determine suggestions width: - if (!that.options.width || that.options.width === 'auto') { - that.options.width = that.el.outerWidth(); + if (!options.width || options.width === 'auto') { + options.width = that.el.outerWidth(); } - that.suggestionsContainer = Autocomplete.utils.createNode(''); + that.suggestionsContainer = Autocomplete.utils.createNode(''); container = $(that.suggestionsContainer); - container.appendTo('body').width(that.options.width); + container.appendTo(options.appendTo).width(options.width); // Listen for mouse over event on suggestions list: container.on('mouseover', suggestionSelector, function () { that.activate($(this).data('index')); }); + // Deselect active element when mouse leaves suggestions container: + container.on('mouseout', function () { + that.selectedIndex = -1; + container.children('.' + selected).removeClass(selected); + }); + // Listen for click event on suggestions list: container.on('click', suggestionSelector, function () { that.select($(this).data('index')); @@ -220,9 +234,18 @@ }, fixPosition: function () { - var offset = this.el.offset(); - $(this.suggestionsContainer).css({ - top: (offset.top + this.el.outerHeight()) + 'px', + var that = this, + offset; + + // Don't adjsut position if custom container has been specified: + if (that.options.appendTo !== 'body') { + return; + } + + offset = that.el.offset(); + + $(that.suggestionsContainer).css({ + top: (offset.top + that.el.outerHeight()) + 'px', left: offset.left + 'px' }); }, @@ -275,7 +298,7 @@ return; } that.select(that.selectedIndex); - if (e.keyCode === keys.TAB) { + if (e.keyCode === keys.TAB && this.options.tabDisabled === false) { return; } break; @@ -378,7 +401,7 @@ that.suggest(); } else if (!that.isBadQuery(q)) { options.onSearchStart.call(that.element, q); - options.params.query = q; + options.params[options.paramName] = q; $.ajax({ url: options.serviceUrl, data: options.params, @@ -434,8 +457,10 @@ that.visible = true; // Select first value by default: - that.selectedIndex = 0; - container.children().first().addClass(classSelected); + if (that.options.autoSelectFirst) { + that.selectedIndex = 0; + container.children().first().addClass(classSelected); + } }, verifySuggestionsFormat: function (suggestions) { @@ -453,18 +478,18 @@ var that = this, response = $.parseJSON(text); - response.suggestions = that.verifySuggestionsFormat(response.suggestions); + response.suggestions = that.verifySuggestionsFormat(that.options.transformResult(response)); // Cache results if cache is not disabled: if (!that.options.noCache) { - that.cachedResponse[response.query] = response; + that.cachedResponse[response[that.options.paramName]] = response; if (response.suggestions.length === 0) { - that.badQueries.push(response.query); + that.badQueries.push(response[that.options.paramName]); } } // Display suggestions only if returned query matches current value: - if (response.query === that.getQuery(that.currentValue)) { + if (response[that.options.paramName] === that.getQuery(that.currentValue)) { that.suggestions = response.suggestions; that.suggest(); } diff --git a/dist/jquery.autocomplete.min.js b/dist/jquery.autocomplete.min.js index fd546e4..0c11df5 100644 --- a/dist/jquery.autocomplete.min.js +++ b/dist/jquery.autocomplete.min.js @@ -1,25 +1,24 @@ /** -* Ajax Autocomplete for jQuery, version 1.2.1 +* Ajax Autocomplete for jQuery, version 1.2.2 * (c) 2013 Tomas Kirda * * Ajax Autocomplete for jQuery is freely distributable under the terms of an MIT-style license. * For details, see the web site: http://www.devbridge.com/projects/autocomplete/jquery/ * -* Last Review: 01/15/2013 */ -(function(d){"function"===typeof define&&define.amd?define(["jquery"],d):d(jQuery)})(function(d){function f(a,b){var c=function(){},c={serviceUrl:null,lookup:null,onSelect:null,width:"auto",minChars:1,maxHeight:300,deferRequestBy:0,params:{},formatResult:f.formatResult,delimiter:null,zIndex:9999,type:"GET",noCache:!1,onSearchStart:c,onSearchComplete:c,containerClass:"autocomplete-suggestions",lookupFilter:function(a,b,c){return-1!==a.value.toLowerCase().indexOf(c)}};this.element=a;this.el=d(a);this.suggestions= -[];this.badQueries=[];this.selectedIndex=-1;this.currentValue=this.element.value;this.intervalId=0;this.cachedResponse=[];this.onChange=this.onChangeInterval=null;this.isLocal=this.ignoreValueChange=!1;this.suggestionsContainer=null;this.options=c;this.classes={selected:"autocomplete-selected",suggestion:"autocomplete-suggestion"};this.initialize();this.setOptions(b)}var h={extend:function(a,b){return d.extend(a,b)},addEvent:function(a,b,c){if(a.addEventListener)a.addEventListener(b,c,!1);else if(a.attachEvent)a.attachEvent("on"+ -b,c);else throw Error("Browser doesn't support addEventListener or attachEvent");},removeEvent:function(a,b,c){a.removeEventListener?a.removeEventListener(b,c,!1):a.detachEvent&&a.detachEvent("on"+b,c)},createNode:function(a){var b=document.createElement("div");b.innerHTML=a;return b.firstChild}};f.utils=h;d.Autocomplete=f;f.formatResult=function(a,b){var c="("+b.replace(RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\)","g"),"\\$1")+")";return a.value.replace(RegExp(c,"gi"),"$1")}; -f.prototype={killerFn:null,initialize:function(){var a=this,b="."+a.classes.suggestion,c;a.element.setAttribute("autocomplete","off");a.killerFn=function(b){0===d(b.target).closest("."+a.options.containerClass).length&&(a.killSuggestions(),a.disableKillerFn())};if(!a.options.width||"auto"===a.options.width)a.options.width=a.el.outerWidth();a.suggestionsContainer=f.utils.createNode('');c=d(a.suggestionsContainer); -c.appendTo("body").width(a.options.width);c.on("mouseover",b,function(){a.activate(d(this).data("index"))});c.on("click",b,function(){a.select(d(this).data("index"))});a.fixPosition();if(window.opera)a.el.on("keypress",function(b){a.onKeyPress(b)});else a.el.on("keydown",function(b){a.onKeyPress(b)});a.el.on("keyup",function(b){a.onKeyUp(b)});a.el.on("blur",function(){a.onBlur()});a.el.on("focus",function(){a.fixPosition()})},onBlur:function(){this.enableKillerFn()},setOptions:function(a){var b=this.options; -h.extend(b,a);if(this.isLocal=d.isArray(b.lookup))b.lookup=this.verifySuggestionsFormat(b.lookup);d(this.suggestionsContainer).css({"max-height":b.maxHeight+"px",width:b.width+"px","z-index":b.zIndex})},clearCache:function(){this.cachedResponse=[];this.badQueries=[]},disable:function(){this.disabled=!0},enable:function(){this.disabled=!1},fixPosition:function(){var a=this.el.offset();d(this.suggestionsContainer).css({top:a.top+this.el.outerHeight()+"px",left:a.left+"px"})},enableKillerFn:function(){d(document).on("click", -this.killerFn)},disableKillerFn:function(){d(document).off("click",this.killerFn)},killSuggestions:function(){var a=this;a.stopKillSuggestions();a.intervalId=window.setInterval(function(){a.hide();a.stopKillSuggestions()},300)},stopKillSuggestions:function(){window.clearInterval(this.intervalId)},onKeyPress:function(a){if(!this.disabled&&!this.visible&&40===a.keyCode&&this.currentValue)this.suggest();else if(!this.disabled&&this.visible){switch(a.keyCode){case 27:this.el.val(this.currentValue);this.hide(); -break;case 9:case 13:if(-1===this.selectedIndex){this.hide();return}this.select(this.selectedIndex);if(9===a.keyCode)return;break;case 38:this.moveUp();break;case 40:this.moveDown();break;default:return}a.stopImmediatePropagation();a.preventDefault()}},onKeyUp:function(a){var b=this;if(!b.disabled){switch(a.keyCode){case 38:case 40:return}clearInterval(b.onChangeInterval);if(b.currentValue!==b.el.val())if(0'+a(e,b)+""});f.html(g).show(); -this.visible=!0;this.selectedIndex=0;f.children().first().addClass(e)}},verifySuggestionsFormat:function(a){return a.length&&"string"===typeof a[0]?d.map(a,function(a){return{value:a,data:null}}):a},processResponse:function(a){a=d.parseJSON(a);a.suggestions=this.verifySuggestionsFormat(a.suggestions);this.options.noCache||(this.cachedResponse[a.query]=a,0===a.suggestions.length&&this.badQueries.push(a.query));a.query===this.getQuery(this.currentValue)&&(this.suggestions=a.suggestions,this.suggest())}, -activate:function(a){var b=this.classes.selected,c=d(this.suggestionsContainer),e=c.children();c.children("."+b).removeClass(b);this.selectedIndex=a;return-1!==this.selectedIndex&&e.length>this.selectedIndex?(a=e.get(this.selectedIndex),d(a).addClass(b),a):null},select:function(a){var b=this.suggestions[a];b&&(this.el.val(b),this.ignoreValueChange=!0,this.hide(),this.onSelect(a))},moveUp:function(){-1!==this.selectedIndex&&(0===this.selectedIndex?(d(this.suggestionsContainer).children().first().removeClass(this.classes.selected), -this.selectedIndex=-1,this.el.val(this.currentValue)):this.adjustScroll(this.selectedIndex-1))},moveDown:function(){this.selectedIndex!==this.suggestions.length-1&&this.adjustScroll(this.selectedIndex+1)},adjustScroll:function(a){var b=this.activate(a),c,e;b&&(b=b.offsetTop,c=d(this.suggestionsContainer).scrollTop(),e=c+this.options.maxHeight-25,be&&d(this.suggestionsContainer).scrollTop(b-this.options.maxHeight+25),this.el.val(this.getValue(this.suggestions[a].value)))}, -onSelect:function(a){var b=this.options.onSelect;a=this.suggestions[a];this.el.val(this.getValue(a.value));d.isFunction(b)&&b.call(this.element,a)},getValue:function(a){var b=this.options.delimiter,c;if(!b)return a;c=this.currentValue;b=c.split(b);return 1===b.length?a:c.substr(0,c.length-b[b.length-1].length)+a}};d.fn.autocomplete=function(a,b){return this.each(function(){var c=d(this),e;if("string"===typeof a){if(e=c.data("autocomplete"),"function"===typeof e[a])e[a](b)}else e=new f(this,a),c.data("autocomplete", -e)})}}); \ No newline at end of file +(function(d){"function"===typeof define&&define.amd?define(["jquery"],d):d(jQuery)})(function(d){function f(a,b){var c=function(){},c={autoSelectFirst:!1,appendTo:"body",serviceUrl:null,lookup:null,onSelect:null,width:"auto",minChars:1,maxHeight:300,deferRequestBy:0,params:{},formatResult:f.formatResult,delimiter:null,zIndex:9999,type:"GET",noCache:!1,onSearchStart:c,onSearchComplete:c,containerClass:"autocomplete-suggestions",tabDisabled:!1,lookupFilter:function(a,b,c){return-1!==a.value.toLowerCase().indexOf(c)}, +paramName:"query",transformResult:function(a){return a.suggestions}};this.element=a;this.el=d(a);this.suggestions=[];this.badQueries=[];this.selectedIndex=-1;this.currentValue=this.element.value;this.intervalId=0;this.cachedResponse=[];this.onChange=this.onChangeInterval=null;this.isLocal=this.ignoreValueChange=!1;this.suggestionsContainer=null;this.options=d.extend({},c,b);this.classes={selected:"autocomplete-selected",suggestion:"autocomplete-suggestion"};this.initialize();this.setOptions(b)}var h= +{extend:function(a,b){return d.extend(a,b)},addEvent:function(a,b,c){if(a.addEventListener)a.addEventListener(b,c,!1);else if(a.attachEvent)a.attachEvent("on"+b,c);else throw Error("Browser doesn't support addEventListener or attachEvent");},removeEvent:function(a,b,c){a.removeEventListener?a.removeEventListener(b,c,!1):a.detachEvent&&a.detachEvent("on"+b,c)},createNode:function(a){var b=document.createElement("div");b.innerHTML=a;return b.firstChild}};f.utils=h;d.Autocomplete=f;f.formatResult=function(a, +b){var c="("+b.replace(RegExp("(\\/|\\.|\\*|\\+|\\?|\\||\\(|\\)|\\[|\\]|\\{|\\}|\\\\)","g"),"\\$1")+")";return a.value.replace(RegExp(c,"gi"),"$1")};f.prototype={killerFn:null,initialize:function(){var a=this,b="."+a.classes.suggestion,c=a.classes.selected,e=a.options,g;a.element.setAttribute("autocomplete","off");a.killerFn=function(b){0===d(b.target).closest("."+a.options.containerClass).length&&(a.killSuggestions(),a.disableKillerFn())};if(!e.width||"auto"===e.width)e.width=a.el.outerWidth(); +a.suggestionsContainer=f.utils.createNode('');g=d(a.suggestionsContainer);g.appendTo(e.appendTo).width(e.width);g.on("mouseover",b,function(){a.activate(d(this).data("index"))});g.on("mouseout",function(){a.selectedIndex=-1;g.children("."+c).removeClass(c)});g.on("click",b,function(){a.select(d(this).data("index"))});a.fixPosition();if(window.opera)a.el.on("keypress",function(b){a.onKeyPress(b)});else a.el.on("keydown", +function(b){a.onKeyPress(b)});a.el.on("keyup",function(b){a.onKeyUp(b)});a.el.on("blur",function(){a.onBlur()});a.el.on("focus",function(){a.fixPosition()})},onBlur:function(){this.enableKillerFn()},setOptions:function(a){var b=this.options;h.extend(b,a);if(this.isLocal=d.isArray(b.lookup))b.lookup=this.verifySuggestionsFormat(b.lookup);d(this.suggestionsContainer).css({"max-height":b.maxHeight+"px",width:b.width+"px","z-index":b.zIndex})},clearCache:function(){this.cachedResponse=[];this.badQueries= +[]},disable:function(){this.disabled=!0},enable:function(){this.disabled=!1},fixPosition:function(){var a;"body"===this.options.appendTo&&(a=this.el.offset(),d(this.suggestionsContainer).css({top:a.top+this.el.outerHeight()+"px",left:a.left+"px"}))},enableKillerFn:function(){d(document).on("click",this.killerFn)},disableKillerFn:function(){d(document).off("click",this.killerFn)},killSuggestions:function(){var a=this;a.stopKillSuggestions();a.intervalId=window.setInterval(function(){a.hide();a.stopKillSuggestions()}, +300)},stopKillSuggestions:function(){window.clearInterval(this.intervalId)},onKeyPress:function(a){if(!this.disabled&&!this.visible&&40===a.keyCode&&this.currentValue)this.suggest();else if(!this.disabled&&this.visible){switch(a.keyCode){case 27:this.el.val(this.currentValue);this.hide();break;case 9:case 13:if(-1===this.selectedIndex){this.hide();return}this.select(this.selectedIndex);if(9===a.keyCode&&!1===this.options.tabDisabled)return;break;case 38:this.moveUp();break;case 40:this.moveDown(); +break;default:return}a.stopImmediatePropagation();a.preventDefault()}},onKeyUp:function(a){var b=this;if(!b.disabled){switch(a.keyCode){case 38:case 40:return}clearInterval(b.onChangeInterval);if(b.currentValue!==b.el.val())if(0'+a(e,b)+""});g.html(f).show();this.visible=!0;this.options.autoSelectFirst&&(this.selectedIndex=0,g.children().first().addClass(e))}},verifySuggestionsFormat:function(a){return a.length&&"string"=== +typeof a[0]?d.map(a,function(a){return{value:a,data:null}}):a},processResponse:function(a){a=d.parseJSON(a);a.suggestions=this.verifySuggestionsFormat(this.options.transformResult(a));this.options.noCache||(this.cachedResponse[a[this.options.paramName]]=a,0===a.suggestions.length&&this.badQueries.push(a[this.options.paramName]));a[this.options.paramName]===this.getQuery(this.currentValue)&&(this.suggestions=a.suggestions,this.suggest())},activate:function(a){var b=this.classes.selected,c=d(this.suggestionsContainer), +e=c.children();c.children("."+b).removeClass(b);this.selectedIndex=a;return-1!==this.selectedIndex&&e.length>this.selectedIndex?(a=e.get(this.selectedIndex),d(a).addClass(b),a):null},select:function(a){var b=this.suggestions[a];b&&(this.el.val(b),this.ignoreValueChange=!0,this.hide(),this.onSelect(a))},moveUp:function(){-1!==this.selectedIndex&&(0===this.selectedIndex?(d(this.suggestionsContainer).children().first().removeClass(this.classes.selected),this.selectedIndex=-1,this.el.val(this.currentValue)): +this.adjustScroll(this.selectedIndex-1))},moveDown:function(){this.selectedIndex!==this.suggestions.length-1&&this.adjustScroll(this.selectedIndex+1)},adjustScroll:function(a){var b=this.activate(a),c,e;b&&(b=b.offsetTop,c=d(this.suggestionsContainer).scrollTop(),e=c+this.options.maxHeight-25,be&&d(this.suggestionsContainer).scrollTop(b-this.options.maxHeight+25),this.el.val(this.getValue(this.suggestions[a].value)))},onSelect:function(a){var b=this.options.onSelect; +a=this.suggestions[a];this.el.val(this.getValue(a.value));d.isFunction(b)&&b.call(this.element,a)},getValue:function(a){var b=this.options.delimiter,c;if(!b)return a;c=this.currentValue;b=c.split(b);return 1===b.length?a:c.substr(0,c.length-b[b.length-1].length)+a}};d.fn.autocomplete=function(a,b){return this.each(function(){var c=d(this),e;if("string"===typeof a){if(e=c.data("autocomplete"),"function"===typeof e[a])e[a](b)}else e=new f(this,a),c.data("autocomplete",e)})}}); \ No newline at end of file diff --git a/src/jquery.autocomplete.js b/src/jquery.autocomplete.js index a9967b2..ae6b45e 100644 --- a/src/jquery.autocomplete.js +++ b/src/jquery.autocomplete.js @@ -1,11 +1,10 @@ /** -* Ajax Autocomplete for jQuery, version 1.2.1 +* Ajax Autocomplete for jQuery, version 1.2.2 * (c) 2013 Tomas Kirda * * Ajax Autocomplete for jQuery is freely distributable under the terms of an MIT-style license. * For details, see the web site: http://www.devbridge.com/projects/autocomplete/jquery/ * -* Last Review: 01/15/2013 */ /*jslint browser: true, white: true, plusplus: true */ @@ -165,7 +164,6 @@ container = $(that.suggestionsContainer); - console.log(options.appendTo); container.appendTo(options.appendTo).width(options.width); // Listen for mouse over event on suggestions list: