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

Merge pull request #325 from taigaio/bug/2179/loading-spinner-should-be-hidden 

fix #2179 - loading always should be hidden
stable
Xaviju 2015-02-09 08:27:59 +01:00
parent 89d883fbad b35ddb3847
commit e946596979
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,12 +138,17 @@ ToggleExcludeClosedSprintsVisualization = ($rootscope, $loading) ->
excludeClosedSprints = true excludeClosedSprints = true
link = ($scope, $el, $attrs) -> link = ($scope, $el, $attrs) ->
# insert loading wrapper
loadingElm = $("<div>")
$el.after(loadingElm)
# Event Handlers # Event Handlers
$el.on "click", (event) -> $el.on "click", (event) ->
event.preventDefault() event.preventDefault()
excludeClosedSprints = not excludeClosedSprints excludeClosedSprints = not excludeClosedSprints
$loading.start($el.parent().siblings('.loading-spinner')) $loading.start(loadingElm)
if excludeClosedSprints if excludeClosedSprints
$rootscope.$broadcast("backlog:unload-closed-sprints") $rootscope.$broadcast("backlog:unload-closed-sprints")
else else
@ -153,7 +158,7 @@ ToggleExcludeClosedSprintsVisualization = ($rootscope, $loading) ->
$el.off() $el.off()
$scope.$on "closed-sprints:reloaded", (ctx, sprints) => $scope.$on "closed-sprints:reloaded", (ctx, sprints) =>
$loading.finish($el.siblings('.loading-spinner')) $loading.finish(loadingElm)
#TODO: i18n #TODO: i18n
if sprints.length > 0 if sprints.length > 0

8
app/coffee/modules/user-settings/main.coffee
View File

@ -129,12 +129,12 @@ UserAvatarDirective = ($auth, $model, $rs, $confirm) ->
$auth.setUser(user) $auth.setUser(user)
$scope.user = user $scope.user = user
$el.find('.overlay').hide() $el.find('.overlay').addClass('hidden')
$confirm.notify('success') $confirm.notify('success')
onError = (response) -> onError = (response) ->
showSizeInfo() if response.status == 413 showSizeInfo() if response.status == 413
$el.find('.overlay').hide() $el.find('.overlay').addClass('hidden')
$confirm.notify('error', response.data._error_message) $confirm.notify('error', response.data._error_message)
# Change photo # Change photo
@ -143,12 +143,12 @@ UserAvatarDirective = ($auth, $model, $rs, $confirm) ->
$el.on "change", "#avatar-field", (event) -> $el.on "change", "#avatar-field", (event) ->
if $scope.avatarAttachment if $scope.avatarAttachment
$el.find('.overlay').css('display', 'flex') $el.find('.overlay').removeClass('hidden')
$rs.userSettings.changeAvatar($scope.avatarAttachment).then(onSuccess, onError) $rs.userSettings.changeAvatar($scope.avatarAttachment).then(onSuccess, onError)
# Use gravatar photo # Use gravatar photo
$el.on "click", "a.use-gravatar", (event) -> $el.on "click", "a.use-gravatar", (event) ->
$el.find('.overlay').show() $el.find('.overlay').removeClass('hidden')
$rs.userSettings.removeAvatar().then(onSuccess, onError) $rs.userSettings.removeAvatar().then(onSuccess, onError)
$scope.$on "$destroy", -> $scope.$on "$destroy", ->

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

@ -18,7 +18,6 @@ section.sprints
a.filter-closed-sprints(tg-backlog-toggle-closed-sprints-visualization, href="", ng-show="totalClosedMilestones") a.filter-closed-sprints(tg-backlog-toggle-closed-sprints-visualization, href="", ng-show="totalClosedMilestones")
span.icon.icon-archive span.icon.icon-archive
span.text Show closed sprints span.text Show closed sprints
div.loading-spinner
div.sprint.sprint-closed(ng-repeat="sprint in closedSprints track by sprint.id" tg-backlog-sprint="sprint", tg-sprint-sortable) div.sprint.sprint-closed(ng-repeat="sprint in closedSprints track by sprint.id" tg-backlog-sprint="sprint", tg-sprint-sortable)
include sprint include sprint

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

@ -14,7 +14,7 @@ div.wrapper(tg-user-profile, ng-controller="UserSettingsController as ctrl",
fieldset(tg-user-avatar) fieldset(tg-user-avatar)
.image-container .image-container
img.avatar(ng-src="{{user.big_photo}}" alt="avatar") img.avatar(ng-src="{{user.big_photo}}" alt="avatar")
.overlay .overlay.hidden
img.loading-spinner(src="/svg/spinner-circle.svg", alt="loading...") img.loading-spinner(src="/svg/spinner-circle.svg", alt="loading...")
input(type="file", id="avatar-field", class="hidden", input(type="file", id="avatar-field", class="hidden",
tg-avatar-model="avatarAttachment") tg-avatar-model="avatarAttachment")

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

@ -26,8 +26,10 @@
margin-right: .3rem; margin-right: .3rem;
} }
} }
.loading {
text-align: center;
}
.loading-spinner { .loading-spinner {
@extend %loading-spinner;
border: 0; border: 0;
flex-grow: 0; flex-grow: 0;
margin-bottom: 1rem; margin-bottom: 1rem;

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

@ -21,7 +21,7 @@
align-items: center; align-items: center;
background: rgba($blackish, .8); background: rgba($blackish, .8);
bottom: 0; bottom: 0;
display: none; display: flex;
justify-content: center; justify-content: center;
left: 0; left: 0;
position: absolute; position: absolute;