From f4038a2160d55a7f519a3b42be1aa96e29e9a908 Mon Sep 17 00:00:00 2001 From: ftimme <ft@falkotimme.com> Date: Wed, 27 Feb 2013 09:01:40 -0500 Subject: [PATCH] - Fixed "FUNCTION databasename.CONCAT does not exist" error for older MySQL versions. --- interface/web/js/jquery.tipsy.js | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/interface/web/js/jquery.tipsy.js b/interface/web/js/jquery.tipsy.js index 52c35b3..735d72e 100644 --- a/interface/web/js/jquery.tipsy.js +++ b/interface/web/js/jquery.tipsy.js @@ -278,8 +278,8 @@ $.ui.autocomplete.escapeRegex(request.term) + ")(?![^<>]*>)(?![^&;]+;)", "gi" ), "<strong>$1</strong>" )), - value: text, - class: (select.hasClass('flags') ? 'country-' + $(this).val().toUpperCase() : $(this).attr('class')), + 'value': (text ? text : ''), + 'class': (select.hasClass('flags') ? 'country-' + ($(this).val() ? $(this).val().toUpperCase() : '') : $(this).attr('class')), option: this }; }) ); @@ -344,7 +344,21 @@ $(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; + } + + // work around a bug (likely same cause as #5265) + $( this ).blur(); + + // 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 ) { @@ -352,7 +366,7 @@ .data( "item.autocomplete", item ) .append( "<a>" + item.label + "</a>" ) .appendTo( ul ); - if(item.class) el.addClass(item.class); + if(item && item['class'] && el) el.addClass(item['class']); return el; }; select.change(function(e) { -- Gitblit v1.9.1