From f379cca4829e69cd2bc54a0be234d95db5075109 Mon Sep 17 00:00:00 2001 From: mcramer <m.cramer@pixcept.de> Date: Mon, 29 Jul 2013 11:13:19 -0400 Subject: [PATCH] Fixed typo from last commit --- interface/web/js/jquery.tipsy.js | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/interface/web/js/jquery.tipsy.js b/interface/web/js/jquery.tipsy.js index 9550eea..5e9c694 100644 --- a/interface/web/js/jquery.tipsy.js +++ b/interface/web/js/jquery.tipsy.js @@ -344,7 +344,18 @@ $(this).autocomplete('option','select').call($(this), event, { item: { option: selected.get(0), internal: true } }); } }) - .addClass( "ui-widget ui-widget-content ui-corner-left" ); + .addClass( "ui-widget ui-widget-content ui-corner-left" ) + .click(function() { + // close if already visible + if ( input.autocomplete( "widget" ).is( ":visible" ) ) { + //input.autocomplete( "close" ); + return; + } + + // pass empty string as value to search for, displaying all results + input.autocomplete( "search", "" ); + input.focus(); + }); if(select.hasClass('flags')) input.addClass('flags'); input.data( "autocomplete" )._renderItem = function( ul, item ) { @@ -360,20 +371,21 @@ internal = false; return; } - var matcher = new RegExp( "" + $.ui.autocomplete.escapeRegex( $(this).val() ) + "", "i" ), - matchtext = $(this).val(); + var matchtext = $(this).val().toLowerCase(); valid = false, - selected = false; + selected = false, + selected_val = ""; select.children( "option" ).each(function() { - if( (($(this).val() == "" && matchtext == "") || $( this ).text().match( matcher )) && $(this).css('display') != 'none' ) { + if( (($(this).val() == "" && matchtext == "") || $( this ).val().toLowerCase() == matchtext) && $(this).css('display') != 'none' ) { valid = true; selected = $(this); + selected_val = $(this).text(); return false; } }); if(!valid) return false; - input.val($(this).val()).autocomplete('option','select').call(input, (e ? e : {target: select}), { item: { option: selected.get(0), internal: true } }); + input.val(selected_val).autocomplete('option','select').call(input, (e ? e : {target: select}), { item: { option: selected.get(0), internal: true } }); }); $( "<a>" ) -- Gitblit v1.9.1