create new version

n1t0 · Nov 15, 2015 · 5bb9aa0 · 5bb9aa0
1 parent da1225b
commit 5bb9aa0
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 12 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-smart-table",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "homepage": "https://github.com/lorenzofox3/Smart-Table",
   "authors": [
     "lorenzofox3 <[email protected]>"

diff --git a/changeLog.md b/changeLog.md
@@ -157,4 +157,11 @@ function(tableState, tableController){
 ## version 2.1.4
 
 * add throttle to sort
-* add watch to first item in collection (@matthewbednarski)
+* add watch to first item in collection (@matthewbednarski)
+
+## version 2.1.5
+
+* #544
+* #533
+* #515
+
diff --git a/dist/smart-table.js b/dist/smart-table.js
@@ -1,5 +1,5 @@
 /** 
-* @version 2.1.4
+* @version 2.1.5
 * @license MIT
 */
 (function (ng, undefined){
@@ -88,10 +88,17 @@ ng.module('smart-table')
 
     if ($attrs.stSafeSrc) {
       safeGetter = $parse($attrs.stSafeSrc);
+      $scope.$watch(function () {
+        var safeSrc = safeGetter($scope);
+        return safeSrc && safeSrc.length ? safeSrc[0] : undefined;
+      }, function (newValue, oldValue) {
+        if (newValue !== oldValue) {
+          updateSafeCopy();
+        }
+      });
       $scope.$watch(function () {
         var safeSrc = safeGetter($scope);
         return safeSrc ? safeSrc.length : 0;
-
       }, function (newValue, oldValue) {
         if (newValue !== safeCopy.length) {
           updateSafeCopy();
@@ -362,7 +369,7 @@ ng.module('smart-table')
             $timeout.cancel(promise);
           }
           if (throttle < 0) {
-            func();
+            scope.$apply(func);
           } else {
             promise = $timeout(func, throttle);
           }

diff --git a/dist/smart-table.min.js b/dist/smart-table.min.js
diff --git a/dist/smart-table.min.js.map b/dist/smart-table.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-smart-table",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/src/stSort.js b/src/stSort.js
@@ -38,7 +38,7 @@ ng.module('smart-table')
             $timeout.cancel(promise);
           }
           if (throttle < 0) {
-            func();
+            scope.$apply(func);
           } else {
             promise = $timeout(func, throttle);
           }

diff --git a/src/stTable.js b/src/stTable.js
@@ -48,10 +48,17 @@ ng.module('smart-table')
 
     if ($attrs.stSafeSrc) {
       safeGetter = $parse($attrs.stSafeSrc);
+      $scope.$watch(function () {
+        var safeSrc = safeGetter($scope);
+        return safeSrc && safeSrc.length ? safeSrc[0] : undefined;
+      }, function (newValue, oldValue) {
+        if (newValue !== oldValue) {
+          updateSafeCopy();
+        }
+      });
       $scope.$watch(function () {
         var safeSrc = safeGetter($scope);
         return safeSrc ? safeSrc.length : 0;
-
       }, function (newValue, oldValue) {
         if (newValue !== safeCopy.length) {
           updateSafeCopy();