Merge pull request facultymatt#52 from danielcrisp/develop

Prevent $digest already in progress error

Author: rike422

dist/unsavedChanges.js

@@ -203,13 +203,16 @@ angular.module('unsavedChanges', ['resettable'])
                     // @todo this could be written a lot cleaner!
                     if (!allFormsClean()) {
                         unsavedWarningsConfig.log("a form is dirty");
-                        if (!confirm(unsavedWarningsConfig.navigateMessage)) {
-                            unsavedWarningsConfig.log("user wants to cancel leaving");
-                            event.preventDefault(); // user clicks cancel, wants to stay on page
-                        } else {
-                            unsavedWarningsConfig.log("user doesn't care about loosing stuff");
-                            $rootScope.$broadcast('resetResettables');
-                        }
+                        // allow any existing scope digest to complete
+                        setTimeout(function () {
+                            if (!confirm(unsavedWarningsConfig.navigateMessage)) {
+                                unsavedWarningsConfig.log("user wants to cancel leaving");
+                                event.preventDefault(); // user clicks cancel, wants to stay on page
+                            } else {
+                                unsavedWarningsConfig.log("user doesn't care about loosing stuff");
+                                $rootScope.$broadcast('resetResettables');
+                            }
+                        });
                     } else {
                         unsavedWarningsConfig.log("all forms are clean");
                     }
@@ -237,8 +240,8 @@ angular.module('unsavedChanges', ['resettable'])
     }
 ])
 
-.directive('unsavedWarningForm', ['unsavedWarningSharedService', '$rootScope',
-    function(unsavedWarningSharedService, $rootScope) {
+.directive('unsavedWarningForm', ['unsavedWarningSharedService', '$rootScope', '$timeout',
+    function(unsavedWarningSharedService, $rootScope, $timeout) {
         return {
             scope: {},
             require: '^form',
@@ -278,7 +281,10 @@ angular.module('unsavedChanges', ['resettable'])
                     // trigger resettables within this form or element 
                     var resettables = angular.element(formElement[0].querySelector('[resettable]'));
                     if(resettables.length) {
-                        scope.$apply(resettables.triggerHandler('resetResettables'));    
+                        // use safer method than $apply
+                        $timeout(function () {
+                            resettables.triggerHandler('resetResettables');
+                        });
                     }
 
                     // sets for back to valid and pristine states

dist/unsavedChanges.min.js

@@ -200,13 +200,16 @@ angular.module('unsavedChanges', ['resettable'])
                     // @todo this could be written a lot cleaner!
                     if (!allFormsClean()) {
                         unsavedWarningsConfig.log("a form is dirty");
-                        if (!confirm(unsavedWarningsConfig.navigateMessage)) {
-                            unsavedWarningsConfig.log("user wants to cancel leaving");
-                            event.preventDefault(); // user clicks cancel, wants to stay on page
-                        } else {
-                            unsavedWarningsConfig.log("user doesn't care about loosing stuff");
-                            $rootScope.$broadcast('resetResettables');
-                        }
+                        // allow any existing scope digest to complete
+                        setTimeout(function () {
+                            if (!confirm(unsavedWarningsConfig.navigateMessage)) {
+                                unsavedWarningsConfig.log("user wants to cancel leaving");
+                                event.preventDefault(); // user clicks cancel, wants to stay on page
+                            } else {
+                                unsavedWarningsConfig.log("user doesn't care about loosing stuff");
+                                $rootScope.$broadcast('resetResettables');
+                            }
+                        });
                     } else {
                         unsavedWarningsConfig.log("all forms are clean");
                     }
@@ -234,8 +237,8 @@ angular.module('unsavedChanges', ['resettable'])
     }
 ])
 
-.directive('unsavedWarningForm', ['unsavedWarningSharedService', '$rootScope',
-    function(unsavedWarningSharedService, $rootScope) {
+.directive('unsavedWarningForm', ['unsavedWarningSharedService', '$rootScope', '$timeout',
+    function(unsavedWarningSharedService, $rootScope, $timeout) {
         return {
             scope: {},
             require: '^form',
@@ -275,7 +278,10 @@ angular.module('unsavedChanges', ['resettable'])
                     // trigger resettables within this form or element 
                     var resettables = angular.element(formElement[0].querySelector('[resettable]'));
                     if(resettables.length) {
-                        scope.$apply(resettables.triggerHandler('resetResettables'));    
+                        // use safer method than $apply
+                        $timeout(function () {
+                            resettables.triggerHandler('resetResettables');
+                        });
                     }
 
                     // sets for back to valid and pristine states