Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions dist/unsavedChanges.js
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dist/unsavedChanges.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 16 additions & 10 deletions src/unsavedChanges.js
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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
Expand Down