From b17d8c9de625c055e41211a130de3bfdf94d5a69 Mon Sep 17 00:00:00 2001
From: Vasile Vartic <vasile.vartic@bytex.ro>
Date: Wed, 25 Oct 2017 16:30:12 +0300
Subject: [PATCH 1/3] QF

---
 src/directives/apMesa.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/directives/apMesa.js b/src/directives/apMesa.js
index b116ea2..c311e58 100644
--- a/src/directives/apMesa.js
+++ b/src/directives/apMesa.js
@@ -463,6 +463,8 @@
               scope.addSort(sort.id, sort.dir);
             });
           }
+        }, getRowSort: function () {
+          return scope.persistentState.sortOrder;
         },
         getRowSort: function () {
           return scope.persistentState.sortOrder;

From 7b4fa0faa6649bedc0dddbec450f96e5373d40fa Mon Sep 17 00:00:00 2001
From: Vasile Vartic <vasile.vartic@bytex.ro>
Date: Mon, 27 Nov 2017 14:07:34 +0200
Subject: [PATCH 2/3] Set local storage before it get it fully

---
 src/directives/apMesa.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/directives/apMesa.js b/src/directives/apMesa.js
index c311e58..a87024d 100644
--- a/src/directives/apMesa.js
+++ b/src/directives/apMesa.js
@@ -219,7 +219,9 @@
         }
 
         updateSortPriority(scope);
-        scope.saveToStorage();
+        if(!angular.equals(columnIds, oldColumnIds) ) {
+          scope.saveToStorage();
+        }
       }, true);
 
       scope.$watch('options', function(newOptions, oldOptions) {
@@ -244,9 +246,9 @@
           //  - sort change
           //  occurs in scope.toggleSort
           //  - column order change
-          deregStorageWatchers.push(scope.$watchCollection('columns', scope.saveToStorage));
+          deregStorageWatchers.push(scope.$watchCollection('columns',(nv, ov) => !angular.equals(nv, ov)? scope.saveToStorage(): undefined));
           //  - search terms change
-          deregStorageWatchers.push(scope.$watchCollection('persistentState.searchTerms', scope.saveToStorage));
+          deregStorageWatchers.push(scope.$watchCollection('persistentState.searchTerms', (nv, ov) => !angular.equals(nv, ov)? scope.saveToStorage(): undefined));
         } else if (deregStorageWatchers.length) {
           deregStorageWatchers.forEach(function(d) { d(); });
           deregStorageWatchers = [];

From 5437126a32d49f48d4de2d73f55a512bcb5940a8 Mon Sep 17 00:00:00 2001
From: Vasile Vartic <vasile.vartic@bytex.ro>
Date: Thu, 18 Jan 2018 15:09:52 +0200
Subject: [PATCH 3/3] Set local storage before it get it fully

---
 src/directives/apMesa.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/directives/apMesa.js b/src/directives/apMesa.js
index a87024d..6cbf4f1 100644
--- a/src/directives/apMesa.js
+++ b/src/directives/apMesa.js
@@ -246,9 +246,17 @@
           //  - sort change
           //  occurs in scope.toggleSort
           //  - column order change
-          deregStorageWatchers.push(scope.$watchCollection('columns',(nv, ov) => !angular.equals(nv, ov)? scope.saveToStorage(): undefined));
+          deregStorageWatchers.push(scope.$watchCollection('columns',function (nv, ov) { 
+            if (!angular.equals(nv, ov)) { 
+              scope.saveToStorage()
+            } 
+          }));
           //  - search terms change
-          deregStorageWatchers.push(scope.$watchCollection('persistentState.searchTerms', (nv, ov) => !angular.equals(nv, ov)? scope.saveToStorage(): undefined));
+          deregStorageWatchers.push(scope.$watchCollection('persistentState.searchTerms', function (nv, ov) { 
+            if (!angular.equals(nv, ov)) { 
+              scope.saveToStorage()
+            } 
+          }));
         } else if (deregStorageWatchers.length) {
           deregStorageWatchers.forEach(function(d) { d(); });
           deregStorageWatchers = [];
@@ -465,8 +473,6 @@
               scope.addSort(sort.id, sort.dir);
             });
           }
-        }, getRowSort: function () {
-          return scope.persistentState.sortOrder;
         },
         getRowSort: function () {
           return scope.persistentState.sortOrder;