diff --git a/app/coffee/modules/admin/lightboxes.coffee b/app/coffee/modules/admin/lightboxes.coffee index a68524b3..bb47e2a4 100644 --- a/app/coffee/modules/admin/lightboxes.coffee +++ b/app/coffee/modules/admin/lightboxes.coffee @@ -29,7 +29,7 @@ MAX_MEMBERSHIP_FIELDSETS = 6 ## Create Members Lightbox Directive ############################################################################# -CreateMembersDirective = ($rs, $rootScope, $confirm) -> +CreateMembersDirective = ($rs, $rootScope, $confirm, lightboxService) -> template = _.template("""
diff --git a/app/coffee/modules/base/confirm.coffee b/app/coffee/modules/base/confirm.coffee index c26f3356..f6788555 100644 --- a/app/coffee/modules/base/confirm.coffee +++ b/app/coffee/modules/base/confirm.coffee @@ -37,14 +37,15 @@ NOTIFICATION_MSG = { } class ConfirmService extends taiga.Service - @.$inject = ["$q"] + @.$inject = ["$q", "lightboxService"] - constructor: (@q) -> + constructor: (@q, @lightboxService) -> _.bindAll(@) hide: -> if @.el - @.el.addClass("hidden") + @lightboxService.close(@.el) + @.el.off(".confirm-dialog") delete @.el @@ -67,7 +68,8 @@ class ConfirmService extends taiga.Service defered.reject() @.hide() - @.el.removeClass("hidden") + @lightboxService.open(@.el) + return defered.promise error: (message) -> @@ -88,7 +90,8 @@ class ConfirmService extends taiga.Service defered.resolve() @.hide() - @.el.removeClass("hidden") + @lightboxService.open(@.el) + return defered.promise success: (message) -> @@ -109,7 +112,8 @@ class ConfirmService extends taiga.Service defered.resolve() @.hide() - @.el.removeClass("hidden") + @lightboxService.open(@.el) + return defered.promise notify: (type, message, title) -> @@ -146,4 +150,4 @@ class ConfirmService extends taiga.Service module = angular.module("taigaBase") -module.service("$tgConfirm", ["$q", ConfirmService]) +module.service("$tgConfirm", ["$q", "lightboxService", ConfirmService]) diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee index 32ad5366..7c4e5400 100644 --- a/app/coffee/modules/common/lightboxes.coffee +++ b/app/coffee/modules/common/lightboxes.coffee @@ -192,7 +192,7 @@ CreateBulkUserstoriesDirective = ($repo, $rs, $rootscope, lightboxService) -> statusId: status bulk: "" } - lightboxService.close($el) + lightboxService.open($el) $el.on "click", ".button-green", (event) -> event.preventDefault()