diff options
| author | Felix Nagel <info@felixnagel.com> | 2012-08-11 19:45:43 +0200 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2012-08-11 19:45:43 +0200 |
| commit | dd272e75689a7e105f7d852f0fc903e4f4bda245 (patch) | |
| tree | 5c097bc4ce4ab3ead310c63ac228bb1f0d3683b6 /ui/jquery.ui.autocomplete.js | |
| parent | 549b97ed6cc718087ce8b9bff3c8556ab4ca7848 (diff) | |
| parent | 30b579f598a3abdc9b0b7ad18bc76c8b5438d5ca (diff) | |
| download | jquery-ui-dd272e75689a7e105f7d852f0fc903e4f4bda245.tar.gz jquery-ui-dd272e75689a7e105f7d852f0fc903e4f4bda245.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.autocomplete.js')
| -rw-r--r-- | ui/jquery.ui.autocomplete.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js index 25d909f8d..617aa9c70 100644 --- a/ui/jquery.ui.autocomplete.js +++ b/ui/jquery.ui.autocomplete.js @@ -3,7 +3,7 @@ * http://jqueryui.com * * Copyright 2012 jQuery Foundation and other contributors - * Dual licensed under the MIT or GPL Version 2 licenses. + * Released under the MIT license. * http://jquery.org/license * * http://docs.jquery.com/UI/Autocomplete @@ -577,7 +577,7 @@ $.widget( "ui.autocomplete", $.ui.autocomplete, { options: { messages: { noResults: "No search results.", - results: function(amount) { + results: function( amount ) { return amount + ( amount > 1 ? " results are" : " result is" ) + " available, use up and down arrow keys to navigate."; } @@ -587,7 +587,7 @@ $.widget( "ui.autocomplete", $.ui.autocomplete, { __response: function( content ) { var message; this._superApply( arguments ); - if ( this.options.disabled || this.cancelSearch) { + if ( this.options.disabled || this.cancelSearch ) { return; } if ( content && content.length ) { |