From 52e5e543af5787350bf9d4e428249ae4cc8cc574 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Wed, 07 Aug 2013 11:42:22 -0400
Subject: [PATCH] - Fixed: php compile fatal errors
---
interface/web/js/jquery.tipsy.js | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/interface/web/js/jquery.tipsy.js b/interface/web/js/jquery.tipsy.js
index efe9612..5e9c694 100644
--- a/interface/web/js/jquery.tipsy.js
+++ b/interface/web/js/jquery.tipsy.js
@@ -250,12 +250,13 @@
var input,
self = this,
select = this.element,
+ internal = false,
selected = select.children( ":selected" ),
value = selected.val() ? selected.text() : "",
wrapper = this.wrapper = $( "<span>" )
.addClass( "ui-combobox" )
.insertAfter( select );
-
+
input = $( "<input>" ).css( { "width": (select.is(':visible') ? (elwidth > 15 ? elwidth - 15 : 1) : 350), "height": (elheight > 0 ? elheight : 16) });
select.hide();
input.appendTo( wrapper )
@@ -277,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
};
}) );
@@ -293,7 +294,10 @@
} else if($(select).attr('onchange')) {
eval($(select).attr('onchange'));
} else {
- if(!ui.item.internal) $(select).change();
+ if(!ui.item.internal) {
+ internal = true;
+ $(select).change();
+ }
}
if (jQuery(".panel #Filter").length > 0) {
jQuery(".panel #Filter").trigger('click');
@@ -340,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 ) {
@@ -348,24 +363,29 @@
.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) {
- var matcher = new RegExp( "" + $.ui.autocomplete.escapeRegex( $(this).val() ) + "", "i" ),
- matchtext = $(this).val();
+ if(internal == true) {
+ internal = false;
+ return;
+ }
+ 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