Correção

joaopaulichi · Feb 8, 2018 · 40b5381 · 40b5381
1 parent 78cb5e0
commit 40b5381
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/build/softgrid.src.js b/build/softgrid.src.js
@@ -599,6 +599,8 @@
                         return;
                     }
 
+                    _getFilteredData();
+
                     if(scope.sg_orderBySaved){
 
                         scope.sg_orderByColIndex = -1;
@@ -625,8 +627,6 @@
                         }
                     }
 
-                    _getFilteredData();
-
                     _atualizarPaginacao();
                 });
 
@@ -686,7 +686,8 @@
 
 				scope.$watch('sg_filter', function(){
 
-					_getFilteredData();
+					if(scope.sg_filter !== "")
+						_getFilteredData();
 
 				})
 

diff --git a/dist/softgrid.js b/dist/softgrid.js
@@ -599,6 +599,8 @@
                         return;
                     }
 
+                    _getFilteredData();
+
                     if(scope.sg_orderBySaved){
 
                         scope.sg_orderByColIndex = -1;
@@ -625,8 +627,6 @@
                         }
                     }
 
-                    _getFilteredData();
-
                     _atualizarPaginacao();
                 });
 
@@ -686,7 +686,8 @@
 
 				scope.$watch('sg_filter', function(){
 
-					_getFilteredData();
+					if(scope.sg_filter !== "")
+						_getFilteredData();
 
 				})
 

diff --git a/dist/softgrid.min.js b/dist/softgrid.min.js
diff --git a/mock/index.html b/mock/index.html
@@ -47,7 +47,7 @@ <h1>Softgrid</h1>
             <hr>
             <div ng-controller="TodoListController as vm">
 
-                <softgrid cols="vm.colunas" data="vm.data" actions="vm.acoes" sg-controls="vm.controles" sg-menu="vm.menu" hide="vm.hide"> </softgrid>
+                <softgrid cols="vm.colunas" data="vm.data" actions="vm.acoes" sg-controls="vm.controles" sg-menu="vm.menu" hide="vm.hide" sg-store="vm.store"> </softgrid>
 
             </div>
 

diff --git a/src/softgrid.js b/src/softgrid.js
@@ -599,6 +599,8 @@
                         return;
                     }
 
+                    _getFilteredData();
+
                     if(scope.sg_orderBySaved){
 
                         scope.sg_orderByColIndex = -1;
@@ -625,8 +627,6 @@
                         }
                     }
 
-                    _getFilteredData();
-
                     _atualizarPaginacao();
                 });
 
@@ -686,7 +686,8 @@
 
 				scope.$watch('sg_filter', function(){
 
-					_getFilteredData();
+					if(scope.sg_filter !== "")
+						_getFilteredData();
 
 				})