From 92a5ebe3342a50e3458ddd7dddfd12b9778892f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Wed, 28 Jan 2015 09:39:37 +0100 Subject: [PATCH] Fix Sprints Spinner --- app/coffee/modules/backlog/sprints.coffee | 4 ++-- app/partials/includes/modules/sprints.jade | 2 +- app/styles/modules/backlog/sprints.scss | 14 +++++++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/app/coffee/modules/backlog/sprints.coffee b/app/coffee/modules/backlog/sprints.coffee index 0c8c4479..2216b78e 100644 --- a/app/coffee/modules/backlog/sprints.coffee +++ b/app/coffee/modules/backlog/sprints.coffee @@ -141,7 +141,7 @@ ToggleExcludeClosedSprintsVisualization = ($rootscope, $loading) -> link = ($scope, $el, $attrs) -> # Event Handlers $el.on "click", "", (event) -> - $loading.start($el.siblings('.load')) + $loading.start($el.parent().siblings('.loading-spinner')) $rootscope.$broadcast("backlog:toggle-closed-sprints-visualization") $scope.$on "$destroy", -> @@ -149,7 +149,7 @@ ToggleExcludeClosedSprintsVisualization = ($rootscope, $loading) -> $scope.$on "sprints:loaded", (ctx, sprints) => closedSprints = _.filter(sprints, (sprint) -> sprint.closed) - $loading.finish($el.siblings('.load')) + $loading.finish($el.parent().siblings('.loading-spinner')) #TODO: i18n if closedSprints.length > 0 diff --git a/app/partials/includes/modules/sprints.jade b/app/partials/includes/modules/sprints.jade index ac57261b..3e95cf9d 100644 --- a/app/partials/includes/modules/sprints.jade +++ b/app/partials/includes/modules/sprints.jade @@ -18,7 +18,7 @@ section.sprints a.filter-closed-sprints(href="", ng-show="totalClosedMilestones") span.icon.icon-archive span(tg-backlog-toggle-closed-sprints-visualization="ctrl.excludeClosedSprints") Show closed sprints - span.load + div.loading-spinner div.sprint.sprint-closed(ng-repeat="sprint in closedSprints track by sprint.id" tg-backlog-sprint="sprint", tg-sprint-sortable) include sprint diff --git a/app/styles/modules/backlog/sprints.scss b/app/styles/modules/backlog/sprints.scss index da706f1e..a3014ec6 100644 --- a/app/styles/modules/backlog/sprints.scss +++ b/app/styles/modules/backlog/sprints.scss @@ -24,11 +24,15 @@ margin-right: .3rem; vertical-align: middle; } - .load { - display: inline-block; - margin-left: .3rem; - vertical-align: middle; - } + } + .loading-spinner { + @extend %loading-spinner; + border: 0; + flex-grow: 0; + margin-bottom: 1rem; + max-height: 2rem; + max-width: 2rem; + transform-origin: center center; } .sprint-name { a {