diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee index eb40615a..4da59d18 100644 --- a/app/coffee/modules/common/lightboxes.coffee +++ b/app/coffee/modules/common/lightboxes.coffee @@ -46,9 +46,10 @@ class LightboxService extends taiga.Service docEl.off(".keyboard-navigation") # Hack: to fix problems in the WYSIWYG textareas when press ENTER $el.one "transitionend", => - $el.css('display', 'none') + $el.removeAttr('style') + $el.removeClass("open").removeClass('close') - $el.removeClass("open") + $el.addClass('close') closeAll: -> docEl = angular.element(document) diff --git a/app/coffee/modules/nav.coffee b/app/coffee/modules/nav.coffee index 2dd1764a..4fb57c09 100644 --- a/app/coffee/modules/nav.coffee +++ b/app/coffee/modules/nav.coffee @@ -59,7 +59,8 @@ class ProjectsNavigationController extends taiga.Controller return projects newProject: -> - @rootscope.$broadcast("projects:create") + @scope.$apply () => + @rootscope.$broadcast("projects:create") filterProjects: (text) -> @scope.filteredProjects = _.filter @scope.projects, (project) -> diff --git a/app/coffee/modules/projects/lightboxes.coffee b/app/coffee/modules/projects/lightboxes.coffee index 6da89b00..e88aaa35 100644 --- a/app/coffee/modules/projects/lightboxes.coffee +++ b/app/coffee/modules/projects/lightboxes.coffee @@ -67,8 +67,7 @@ CreateProject = ($rootscope, $repo, $confirm, $location, $navurls, $rs, $project $scope.templates = result $scope.data.creation_template = _.head(_.filter($scope.templates, (x) -> x.slug == "scrum")).id else - $scope.$apply -> - $scope.data.creation_template = _.head(_.filter($scope.templates, (x) -> x.slug == "scrum")).id + $scope.data.creation_template = _.head(_.filter($scope.templates, (x) -> x.slug == "scrum")).id $el.find(".active").removeClass("active") $el.find(".create-step1").addClass("active") diff --git a/app/partials/views/modules/projects-nav.jade b/app/partials/views/modules/projects-nav.jade index 5013a176..27f668cf 100644 --- a/app/partials/views/modules/projects-nav.jade +++ b/app/partials/views/modules/projects-nav.jade @@ -3,7 +3,7 @@ include ../components/spinner p Loading project... -div.wizard-create-project.hidden(tg-lb-create-project) +div.wizard-create-project(tg-lb-create-project) include wizard-create-project nav.projects-nav(ng-controller="ProjectsNavigationController", tg-projects-nav, tg-projects-pagination, projects="projects") diff --git a/app/styles/modules/common/lightbox.scss b/app/styles/modules/common/lightbox.scss index 301077ff..f24a7b3d 100644 --- a/app/styles/modules/common/lightbox.scss +++ b/app/styles/modules/common/lightbox.scss @@ -1,7 +1,6 @@ .lightbox, %lightbox { @include background-opacity($white, .95); - @include transition (opacity .3s ease); bottom: 0; display: none; left: 0; @@ -21,6 +20,10 @@ @include transition (opacity .3s ease); opacity: 1; } + &.close { + @include transition (opacity .3s ease); + opacity: 0; + } .title { text-align: center; }