Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit d9ad902

Browse files
author
James Kleeh
committed
Update angular-confirm.js
1 parent d0085d9 commit d9ad902

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

angular-confirm.js

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,17 @@ angular.module('angular-confirm', ['ui.bootstrap'])
2121
controller: 'ConfirmModalController'
2222
})
2323
.factory('$confirm', function($modal, $confirmModalDefaults) {
24-
return function(obj) {
25-
var settings = angular.extend($confirmModalDefaults, (obj.settings || {})),
26-
func = obj.confirmed || function() {},
27-
data = obj.data || {text: ''};
24+
return function(data, settings) {
25+
settings = angular.extend($confirmModalDefaults, (settings || {}));
26+
data = data || {};
2827

2928
if ('templateUrl' in settings && 'template' in settings) {
3029
delete settings.template;
3130
}
3231

3332
settings.resolve = {data: function() { return data; }};
3433

35-
var modal = $modal.open(settings);
36-
37-
modal.result.then(func);
34+
return $modal.open(settings).result;
3835
};
3936
})
4037
.directive('confirm', function($confirm) {
@@ -54,10 +51,7 @@ angular.module('angular-confirm', ['ui.bootstrap'])
5451
}
5552

5653
function bindConfirm() {
57-
$confirm({
58-
data: {text: scope.confirm},
59-
confirmed: scope.ngClick
60-
});
54+
$confirm({text: scope.confirm}).then(scope.ngClick);
6155
}
6256

6357
if ('confirmIf' in attrs) {

0 commit comments

Comments
 (0)