Merge pull request #66 from masimakopoulos/master

make sure all watches are cleared

Author: mendhak

build/angular-intro.min.js

@@ -34,11 +34,13 @@
             link: function(scope, element, attrs) {
 
                 var intro;
+                var refreshWatch;
+                var navigationWatch;
 
                 scope.ngIntroMethod = function(step) {
 
 
-                    var navigationWatch = scope.$on('$locationChangeStart', function(){
+                    navigationWatch = scope.$on('$locationChangeStart', function(){
                       intro.exit();
                     });
 
@@ -52,7 +54,7 @@
                     intro.setOptions(scope.ngIntroOptions);
 
                     if (scope.ngIntroAutorefresh) {
-                      scope.$watch(function(){
+                      refreshWatch = scope.$watch(function(){
                         intro.refresh();
                       });
                     }
@@ -61,15 +63,15 @@
                         intro.oncomplete(function() {
                             scope.ngIntroOncomplete.call(this, scope);
                             $timeout(function() {scope.$digest();});
-                            navigationWatch();
+                            clearWatches();
                         });
                     }
 
                     if (scope.ngIntroOnexit) {
                         intro.onexit(function() {
                             scope.ngIntroOnexit.call(this, scope);
                             $timeout(function() {scope.$digest();});
-                            navigationWatch();
+                            clearWatches();
                         });
                     }
 
@@ -114,7 +116,7 @@
                     callback();
                 };
 
-                var autoStartWatch = scope.$watch('ngIntroAutostart', function (){
+                var autoStartWatch = scope.$watch('ngIntroAutostart', function () {
                     if(scope.ngIntroAutostart){
                         $timeout(function() {
                             scope.ngIntroMethod();
@@ -127,6 +129,15 @@
                     if (typeof intro !== 'undefined')
                         intro.exit();
                 });
+
+                var clearWatches = function() {
+                    if(navigationWatch) navigationWatch();
+                    if(refreshWatch) refreshWatch();
+                };
+
+                scope.$on('$destroy', function() {
+                    clearWatches();
+                });
             }
         };
     }]);