taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #289 from taigaio/issue/2044/spinner 

Fix multiple spinners
stable
Alejandro 2015-01-28 14:14:37 +01:00
parent 746405782c 68d5e4a8bf
commit f3dd62bf90
10 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/coffee/modules/backlog/sprints.coffee
View File

@ -143,7 +143,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", ->
@ -151,7 +151,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

2
app/partials/includes/modules/sprints.jade
View File

@ -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

4
app/partials/user/user-profile.jade
View File

@ -14,8 +14,8 @@ div.wrapper(tg-user-profile, ng-controller="UserSettingsController as ctrl",
fieldset(tg-user-avatar)
.image-container
img.avatar(ng-src="{{user.big_photo}}" alt="avatar")
div.overlay
span.icon.icon-spinner
.overlay
img.loading-spinner(src="/svg/spinner-circle.svg", alt="loading...")
input(type="file", id="avatar-field", class="hidden",
tg-avatar-model="avatarAttachment")
p The image will be cropped to 80x80px.<br>

7
app/styles/dependencies/helpers.scss
View File

@ -59,9 +59,10 @@
padding: 12px;
text-align: center;
}
.loading-spinner {
@extend %loading-spinner;
}
}
.loading-spinner {
@extend %loading-spinner;
}
%button {

3
app/styles/layout/us-detail.scss
View File

@ -349,9 +349,6 @@
.level-name {
color: darken($whitish, 20%);
float: right;
.loading-spinner {
@extend %loading-spinner;
}
}
}

14
app/styles/modules/backlog/sprints.scss
View File

@ -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 {

3
app/styles/modules/common/assigned-to.scss
View File

@ -12,7 +12,8 @@
}
.loading-spinner {
@extend %loading-spinner;
margin: 0 auto;
margin: 1rem auto;
max-height: 2rem;
max-width: 2rem;
}
.user-avatar {

6
app/styles/modules/common/history.scss
View File

@ -108,12 +108,6 @@
.preview-icon {
opacity: 0;
}
.loading-spinner {
@extend %loading-spinner;
max-height: 1rem;
max-width: 1rem;
}
}
.show-more-comments {
@extend %small;

7
app/styles/modules/user-settings/user-profile.scss
View File

@ -19,7 +19,7 @@
.overlay {
align-content: center;
align-items: center;
background: rgba($blackish, .9);
background: rgba($blackish, .8);
bottom: 0;
display: none;
justify-content: center;
@ -33,8 +33,9 @@
@extend %loading-spinner;
border: 0;
flex-grow: 0;
transform-origin: 32 32;
width: 30%;
max-height: 3rem;
max-width: 3rem;
transform-origin: center center;
}
p {
@extend %xsmall;

5
app/styles/modules/wiki/wiki-nav.scss
View File

@ -35,11 +35,6 @@
padding: 8px;
text-align: center;
width: 100%;
.loading-spinner {
@extend %loading-spinner;
max-height: 1rem;
max-width: 1rem;
}
}
}
.button {