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 |   62 ++++++++++++++++++++++---------
 1 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/interface/web/js/jquery.tipsy.js b/interface/web/js/jquery.tipsy.js
index 27fa06d..5e9c694 100644
--- a/interface/web/js/jquery.tipsy.js
+++ b/interface/web/js/jquery.tipsy.js
@@ -249,18 +249,19 @@
             var elheight = this.element.height();
             var input,
                 self = this,
-                select = this.element.hide(),
+                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>" )
-                .appendTo( wrapper )
+            
+            input = $( "<input>" ).css( { "width": (select.is(':visible') ? (elwidth > 15 ? elwidth - 15 : 1) : 350), "height": (elheight > 0 ? elheight : 16) });
+            select.hide();
+            input.appendTo( wrapper )
                 .val( value )
                 .addClass( "ui-state-default ui-combobox-input" )
-                .css( { "width": (elwidth > 15 ? elwidth - 15 : 1), "height": elheight })
                 .autocomplete({
                     delay: 0,
                     minLength: 0,
@@ -269,7 +270,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 == "" ? "&nbsp;" : text.replace(
                                         new RegExp(
@@ -277,7 +278,8 @@
                                             $.ui.autocomplete.escapeRegex(request.term) +
                                             ")(?![^<>]*>)(?![^&;]+;)", "gi"
                                         ), "<strong>$1</strong>" )),
-                                    value: text,
+                                    'value': (text ? text : ''),
+                                    'class': (select.hasClass('flags') ? 'country-' + ($(this).val() ? $(this).val().toUpperCase() : '') : $(this).attr('class')),
                                     option: this
                                 };
                         }) );
@@ -291,6 +293,11 @@
                             select.onchange( { target: select } );
                         } else if($(select).attr('onchange')) {
                             eval($(select).attr('onchange'));
+                        } else {
+                            if(!ui.item.internal) {
+                                internal = true;
+                                $(select).change();
+                            }
                         }
                         if (jQuery(".panel #Filter").length > 0) {
                             jQuery(".panel #Filter").trigger('click');
@@ -302,7 +309,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;
@@ -326,7 +333,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;
@@ -334,32 +341,51 @@
                         });
                         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" );
+                .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 ) {
-                return $( "<li></li>" )
+                var el = $( "<li></li>" )
                     .data( "item.autocomplete", item )
                     .append( "<a>" + item.label + "</a>" )
                     .appendTo( ul );
+                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 ) ) {
+                    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) } });
+                input.val(selected_val).autocomplete('option','select').call(input, (e ? e : {target: select}), { item: { option: selected.get(0), internal: true } });
             });
 
             $( "<a>" )
@@ -374,7 +400,7 @@
                 })
                 .removeClass( "ui-corner-all" )
                 .addClass( "ui-corner-right ui-combobox-toggle" )
-                .css( { "width": 15, "height": elheight })
+                .css( { "width": 15, "height": (elheight > 0 ? elheight : 16) })
                 .click(function() {
                     // close if already visible
                     if ( input.autocomplete( "widget" ).is( ":visible" ) ) {

--
Gitblit v1.9.1