fix bulk & confirm lightboxes
parent
2d8b04663a
commit
60739cfdce
|
@ -29,7 +29,7 @@ MAX_MEMBERSHIP_FIELDSETS = 6
|
||||||
## Create Members Lightbox Directive
|
## Create Members Lightbox Directive
|
||||||
#############################################################################
|
#############################################################################
|
||||||
|
|
||||||
CreateMembersDirective = ($rs, $rootScope, $confirm) ->
|
CreateMembersDirective = ($rs, $rootScope, $confirm, lightboxService) ->
|
||||||
template = _.template("""
|
template = _.template("""
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<input type="email" placeholder="Type an Email" data-required="true" />
|
<input type="email" placeholder="Type an Email" data-required="true" />
|
||||||
|
|
|
@ -37,14 +37,15 @@ NOTIFICATION_MSG = {
|
||||||
}
|
}
|
||||||
|
|
||||||
class ConfirmService extends taiga.Service
|
class ConfirmService extends taiga.Service
|
||||||
@.$inject = ["$q"]
|
@.$inject = ["$q", "lightboxService"]
|
||||||
|
|
||||||
constructor: (@q) ->
|
constructor: (@q, @lightboxService) ->
|
||||||
_.bindAll(@)
|
_.bindAll(@)
|
||||||
|
|
||||||
hide: ->
|
hide: ->
|
||||||
if @.el
|
if @.el
|
||||||
@.el.addClass("hidden")
|
@lightboxService.close(@.el)
|
||||||
|
|
||||||
@.el.off(".confirm-dialog")
|
@.el.off(".confirm-dialog")
|
||||||
delete @.el
|
delete @.el
|
||||||
|
|
||||||
|
@ -67,7 +68,8 @@ class ConfirmService extends taiga.Service
|
||||||
defered.reject()
|
defered.reject()
|
||||||
@.hide()
|
@.hide()
|
||||||
|
|
||||||
@.el.removeClass("hidden")
|
@lightboxService.open(@.el)
|
||||||
|
|
||||||
return defered.promise
|
return defered.promise
|
||||||
|
|
||||||
error: (message) ->
|
error: (message) ->
|
||||||
|
@ -88,7 +90,8 @@ class ConfirmService extends taiga.Service
|
||||||
defered.resolve()
|
defered.resolve()
|
||||||
@.hide()
|
@.hide()
|
||||||
|
|
||||||
@.el.removeClass("hidden")
|
@lightboxService.open(@.el)
|
||||||
|
|
||||||
return defered.promise
|
return defered.promise
|
||||||
|
|
||||||
success: (message) ->
|
success: (message) ->
|
||||||
|
@ -109,7 +112,8 @@ class ConfirmService extends taiga.Service
|
||||||
defered.resolve()
|
defered.resolve()
|
||||||
@.hide()
|
@.hide()
|
||||||
|
|
||||||
@.el.removeClass("hidden")
|
@lightboxService.open(@.el)
|
||||||
|
|
||||||
return defered.promise
|
return defered.promise
|
||||||
|
|
||||||
notify: (type, message, title) ->
|
notify: (type, message, title) ->
|
||||||
|
@ -146,4 +150,4 @@ class ConfirmService extends taiga.Service
|
||||||
|
|
||||||
|
|
||||||
module = angular.module("taigaBase")
|
module = angular.module("taigaBase")
|
||||||
module.service("$tgConfirm", ["$q", ConfirmService])
|
module.service("$tgConfirm", ["$q", "lightboxService", ConfirmService])
|
||||||
|
|
|
@ -192,7 +192,7 @@ CreateBulkUserstoriesDirective = ($repo, $rs, $rootscope, lightboxService) ->
|
||||||
statusId: status
|
statusId: status
|
||||||
bulk: ""
|
bulk: ""
|
||||||
}
|
}
|
||||||
lightboxService.close($el)
|
lightboxService.open($el)
|
||||||
|
|
||||||
$el.on "click", ".button-green", (event) ->
|
$el.on "click", ".button-green", (event) ->
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
|
|
Loading…
Reference in New Issue