From edaa7c5d66ef52eec1c15f79ae4034fc3e67b9b7 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Thu, 25 Oct 2012 10:29:39 -0400 Subject: [PATCH] - Fixed: FS#2502 - Problem in web traffic accounting for large integers - Added intval function from interface functions library to server system library. --- interface/web/js/jquery.tipsy.js | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/interface/web/js/jquery.tipsy.js b/interface/web/js/jquery.tipsy.js index 77836f8..efe9612 100644 --- a/interface/web/js/jquery.tipsy.js +++ b/interface/web/js/jquery.tipsy.js @@ -269,7 +269,7 @@ response( select.children( "option" ).map(function() { var text = $( this ).text(); //if ( this.value && ( !request.term || matcher.test(text) ) ) - if ( !request.term || matcher.test(text) ) + if ( (!request.term || matcher.test(text)) && $(this).css('display') != 'none' ) return { label: (text == "" ? " " : text.replace( new RegExp( @@ -278,7 +278,7 @@ ")(?![^<>]*>)(?![^&;]+;)", "gi" ), "<strong>$1</strong>" )), value: text, - class: (select.hasClass('flags') ? 'country-' + $(this).val() : $(this).attr('class')), + class: (select.hasClass('flags') ? 'country-' + $(this).val().toUpperCase() : $(this).attr('class')), option: this }; }) ); @@ -292,6 +292,8 @@ select.onchange( { target: select } ); } else if($(select).attr('onchange')) { eval($(select).attr('onchange')); + } else { + if(!ui.item.internal) $(select).change(); } if (jQuery(".panel #Filter").length > 0) { jQuery(".panel #Filter").trigger('click'); @@ -303,7 +305,7 @@ matchtext = $(this).val(); valid = false; select.children( "option" ).each(function() { - if( ($(this).text() == "" && matchtext == "") || $( this ).text().match( matcher ) ) { + if( (($(this).text() == "" && matchtext == "") || $( this ).text().match( matcher )) && $(this).css('display') != 'none' ) { select.val($(this).val()); this.selected = valid = true; return false; @@ -327,7 +329,7 @@ valid = false, selected = false; select.children( "option" ).each(function() { - if( ($(this).val() == "" && matchtext == "") || $( this ).text().match( matcher ) ) { + if( (($(this).val() == "" && matchtext == "") || $( this ).text().match( matcher )) && $(this).css('display') != 'none' ) { valid = true; selected = $(this); return false; @@ -335,7 +337,7 @@ }); if(!valid) return false; - $(this).autocomplete('option','select').call($(this), event, { item: { option: selected.get(0) } }); + $(this).autocomplete('option','select').call($(this), event, { item: { option: selected.get(0), internal: true } }); } }) .addClass( "ui-widget ui-widget-content ui-corner-left" ); @@ -355,7 +357,7 @@ valid = false, selected = false; select.children( "option" ).each(function() { - if( ($(this).val() == "" && matchtext == "") || $( this ).text().match( matcher ) ) { + if( (($(this).val() == "" && matchtext == "") || $( this ).text().match( matcher )) && $(this).css('display') != 'none' ) { valid = true; selected = $(this); return false; @@ -363,7 +365,7 @@ }); if(!valid) return false; - input.val($(this).val()).autocomplete('option','select').call(input, (e ? e : {target: select}), { item: { option: selected.get(0) } }); + input.val($(this).val()).autocomplete('option','select').call(input, (e ? e : {target: select}), { item: { option: selected.get(0), internal: true } }); }); $( "<a>" ) -- Gitblit v1.9.1