[Fmsystem-commits] [13112]

[Nelson Guerra]

Revision: 13112
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13112
Author:   nelson224
Date:     2015-04-29 22:02:15 +0000 (Wed, 29 Apr 2015)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.uigab.inc.php

Modified: branches/dev-syncromind/property/inc/class.uigab.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uigab.inc.php    2015-04-29 
14:11:28 UTC (rev 13111)
+++ branches/dev-syncromind/property/inc/class.uigab.inc.php    2015-04-29 
22:02:15 UTC (rev 13112)
@@ -323,7 +323,7 @@
                        }*/
                        unset($parameters);
                        
-                       $columns = array (
+                       $inputFilters = array (
                                'gaards_nr'             =>      lang('Gaards 
nr'),
                                'bruksnr'               =>      lang('Bruks 
nr'),
                                'feste_nr'              =>      lang('Feste 
nr'),
@@ -332,27 +332,30 @@
                                'address'               =>      lang('Address')
                        );
                        
-                       $code = "var columns = ".json_encode($columns);
+                       $code = "var inputFilters = 
".json_encode($inputFilters);
                                        
                        $code .= <<<JS
                                
                                function initCompleteDatatable(oSettings, json, 
oTable) 
                                {
                                        
$('#datatable-container_filter').empty();
-                                       $.each(columns, function(i, val) 
+                                       $.each(inputFilters, function(i, val) 
                                        {
                                                
$('#datatable-container_filter').append('<input type="text" placeholder="Search 
'+val+'" id="'+i+'" />');
                                        });
                                        
-                                       // Apply the search
-                                       var api = oTable.api();
+                                       var valuesInputFilter = {};
                                        
-                                       $.each(columns, function(i, val) 
+                                       $.each(inputFilters, function(i, val) 
                                        {
+                                               valuesInputFilter[i] = '';
                                                $( '#' + i).on( 'keyup change', 
function () 
                                                {
-                                                       
oTable.dataTableSettings[0]['ajax']['data'][i] = this.value;
-                                                       oTable.fnDraw();
+                                                       if ( 
$.trim($(this).val()) != $.trim(valuesInputFilter[i]) ) 
+                                                       {
+                                                               filterData(i, 
$(this).val());
+                                                               
valuesInputFilter[i] = $(this).val();
+                                                       }
                                                });
                                        });
                                };