From b37e062d4e20bb3404721c095ea9e2fc403a6dae Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 24 Jun 2014 12:16:02 +0200 Subject: [PATCH] Fixing show filters behaviour in backlog --- app/coffee/modules/backlog/lightboxes.coffee | 8 ++++---- app/coffee/modules/backlog/main.coffee | 4 ++++ app/coffee/utils.coffee | 7 +++++++ app/styles/components/buttons.scss | 3 ++- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/app/coffee/modules/backlog/lightboxes.coffee b/app/coffee/modules/backlog/lightboxes.coffee index c862b39a..1ac9c1be 100644 --- a/app/coffee/modules/backlog/lightboxes.coffee +++ b/app/coffee/modules/backlog/lightboxes.coffee @@ -53,8 +53,8 @@ CreateEditUserstoryDirective = ($repo, $model, $rs) -> isNew = true editDescription($scope, $el) # Update texts for creation - $el.find(".button-green span").html("Create") - $el.find(".title").html("New user story ") + $el.find(".button-green span").html("Create") #TODO: i18n + $el.find(".title").html("New user story ") #TODO: i18n $el.removeClass("hidden") $scope.$on "usform:edit", (ctx, us) -> @@ -62,8 +62,8 @@ CreateEditUserstoryDirective = ($repo, $model, $rs) -> isNew = false editDescription($scope, $el) # Update texts for edition - $el.find(".button-green span").html("Save") - $el.find(".title").html("Edit user story ") + $el.find(".button-green span").html("Save") #TODO: i18n + $el.find(".title").html("Edit user story ") #TODO: i18n $el.removeClass("hidden") # Update requirement info (team, client or blocked) diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee index fb2153c0..955ede7e 100644 --- a/app/coffee/modules/backlog/main.coffee +++ b/app/coffee/modules/backlog/main.coffee @@ -21,6 +21,7 @@ taiga = @.taiga mixOf = @.taiga.mixOf +toggleText = @.taiga.toggleText class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin) constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q) -> @@ -208,7 +209,10 @@ BacklogDirective = ($repo) -> $scope.filtersSearch = {} $el.on "click", "#show-filters-button", (event) -> event.preventDefault() + target = angular.element(event.currentTarget) $el.find("sidebar.filters-bar").toggle() + target.toggleClass("active") + toggleText(target.find(".text"), ["Hide Filters", "Show Filters"]) # TODO: i18n $el.on "click", "section.filters a.single-filter", (event) -> event.preventDefault() diff --git a/app/coffee/utils.coffee b/app/coffee/utils.coffee index 6593271e..5d457bce 100644 --- a/app/coffee/utils.coffee +++ b/app/coffee/utils.coffee @@ -43,8 +43,15 @@ mixOf = (base, mixins...) -> trim = (data, char) -> return _.str.trim(data, char) +toggleText = (element, texts) -> + nextTextPosition = element.data('nextTextPosition') + nextTextPosition = 0 if not nextTextPosition? or nextTextPosition >= texts.length + text = texts[nextTextPosition] + element.data('nextTextPosition', nextTextPosition + 1) + element.text(text) taiga = @.taiga taiga.bindOnce = bindOnce taiga.mixOf = mixOf taiga.trim = trim +taiga.toggleText = toggleText diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss index 55f29807..865dc356 100755 --- a/app/styles/components/buttons.scss +++ b/app/styles/components/buttons.scss @@ -2,7 +2,8 @@ .trans-button { @extend %large; font-family: 'ostrichSans'; - &:hover { + &:hover, + &.active { @include transition (color .3s linear); color: $green-taiga; }