- Leave when scope is destroyed

- Fix bower version
nissoh · Jan 12, 2015 · edfd563 · edfd563
1 parent a9219a9
commit edfd563
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-tether",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "main": "./dist/angular-tether.js",
   "repository": {
     "type": "git",

diff --git a/dist/angular-tether.js b/dist/angular-tether.js
@@ -129,6 +129,9 @@
         scope.$watch(function () {
           tether.tetherInstance.position();
         });
+        scope.$on('$destroy', function () {
+          scope.$applyAsync(tether.leave);
+        });
         // prevents document instant click fire. there's no need to run digest cycle.
         setTimeout(function () {
           if (config.leaveOnBlur) {
@@ -140,6 +143,7 @@
       function leaveOnBlur(evt) {
         var target = evt.target;
         if (tether.active === false || target === element[0]) {
+          target = null;
           return;
         }
         while (target.parentElement !== null) {
@@ -176,7 +180,7 @@
         return $animate.leave(element);
       };
       // backward compatible method until next major version is released
-      tether.isActive = function () {
+      tether.isActive = function isActive() {
         return tether.active;
       };
       tether.active = false;

diff --git a/dist/angular-tether.min.js b/dist/angular-tether.min.js
diff --git a/src/angular-tether.js b/src/angular-tether.js
@@ -100,6 +100,10 @@
           tether.tetherInstance.position();
         });
 
+        scope.$on('$destroy', function(){
+          scope.$applyAsync(tether.leave);
+        });
+
         // prevents document instant click fire. there's no need to run digest cycle.
         setTimeout(function(){
           if (config.leaveOnBlur) {
@@ -113,6 +117,7 @@
       function leaveOnBlur(evt) {
         var target = evt.target;
         if (tether.active === false || target === element[0]) {
+          target = null;
           return;
         }
 
@@ -159,7 +164,7 @@
       };
 
       // backward compatible method until next major version is released
-      tether.isActive = function() {
+      tether.isActive = function isActive() {
         return tether.active;
       };