Release v2.6.1

flowjs · Mar 28, 2015 · ee61530 · ee61530
1 parent 16abdcc
commit ee61530
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 8 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-flow",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "ignore": [
     "**/.*",
     "test",

diff --git a/dist/ng-flow-standalone.js b/dist/ng-flow-standalone.js
@@ -1631,7 +1631,7 @@ angular.module('flow.init', ['flow.provider'])
     // use existing flow object or create a new one
     var flow  = $scope.$eval($attrs.flowObject) || flowFactory.create(options);
 
-    flow.on('catchAll', function (eventName) {
+    var catchAllHandler = function(eventName){
       var args = Array.prototype.slice.call(arguments);
       args.shift();
       var event = $scope.$broadcast.apply($scope, ['flow::' + eventName, flow].concat(args));
@@ -1643,9 +1643,15 @@ angular.module('flow.init', ['flow.provider'])
       if (event.defaultPrevented) {
         return false;
       }
+    };
+
+    flow.on('catchAll', catchAllHandler);
+    $scope.$on('$destroy', function(){
+        flow.off('catchAll', catchAllHandler);
     });
 
     $scope.$flow = flow;
+
     if ($attrs.hasOwnProperty('flowName')) {
       $parse($attrs.flowName).assign($scope, flow);
       $scope.$on('$destroy', function () {

diff --git a/dist/ng-flow-standalone.min.js b/dist/ng-flow-standalone.min.js
diff --git a/dist/ng-flow.js b/dist/ng-flow.js
@@ -69,7 +69,7 @@ angular.module('flow.init', ['flow.provider'])
     // use existing flow object or create a new one
     var flow  = $scope.$eval($attrs.flowObject) || flowFactory.create(options);
 
-    flow.on('catchAll', function (eventName) {
+    var catchAllHandler = function(eventName){
       var args = Array.prototype.slice.call(arguments);
       args.shift();
       var event = $scope.$broadcast.apply($scope, ['flow::' + eventName, flow].concat(args));
@@ -81,9 +81,15 @@ angular.module('flow.init', ['flow.provider'])
       if (event.defaultPrevented) {
         return false;
       }
+    };
+
+    flow.on('catchAll', catchAllHandler);
+    $scope.$on('$destroy', function(){
+        flow.off('catchAll', catchAllHandler);
     });
 
     $scope.$flow = flow;
+
     if ($attrs.hasOwnProperty('flowName')) {
       $parse($attrs.flowName).assign($scope, flow);
       $scope.$on('$destroy', function () {

diff --git a/dist/ng-flow.min.js b/dist/ng-flow.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-flow",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "Flow.js html5 file upload extension on angular.js framework",
   "scripts": {
     "test": "grunt test"