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

disable auto loader

stable
Juanfran 2014-08-18 10:38:59 +02:00
parent 5ee934a81e
commit dfb52a4115
6 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/coffee/app.coffee
View File

@ -24,10 +24,10 @@
configure = ($routeProvider, $locationProvider, $httpProvider, $provide, tgLoaderProvider) ->
$routeProvider.when("/", {templateUrl: "/partials/projects.html"})
$routeProvider.when("/project/:pslug/", {templateUrl: "/partials/project.html"})
$routeProvider.when("/project/:pslug/backlog", {templateUrl: "/partials/backlog.html", resolve: {loader: tgLoaderProvider.add(true)}})
$routeProvider.when("/project/:pslug/backlog", {templateUrl: "/partials/backlog.html", resolve: {loader: tgLoaderProvider.add()}})
$routeProvider.when("/project/:pslug/taskboard/:id", {templateUrl: "/partials/taskboard.html"})
$routeProvider.when("/project/:pslug/search", {templateUrl: "/partials/search.html", reloadOnSearch: false})
$routeProvider.when("/project/:pslug/kanban", {templateUrl: "/partials/kanban.html"})
$routeProvider.when("/project/:pslug/kanban", {templateUrl: "/partials/kanban.html", resolve: {loader: tgLoaderProvider.add()}})
# User stories
$routeProvider.when("/project/:pslug/us/:usref",
@ -54,7 +54,7 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, tgLoade
{templateUrl: "/partials/wiki-edit.html"})
# Issues
$routeProvider.when("/project/:pslug/issues", {templateUrl: "/partials/issues.html", resolve: {loader: tgLoaderProvider.add(true)}})
$routeProvider.when("/project/:pslug/issues", {templateUrl: "/partials/issues.html", resolve: {loader: tgLoaderProvider.add()}})
$routeProvider.when("/project/:pslug/issues/:issueref",
{templateUrl: "/partials/issues-detail.html"})

6
app/coffee/modules/backlog/main.coffee
View File

@ -43,10 +43,11 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
"$routeParams",
"$q",
"$tgLocation",
"$appTitle"
"$appTitle",
"tgLoader"
]
constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @appTitle) ->
constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @appTitle, tgLoader) ->
_.bindAll(@)
@scope.sectionName = "Backlog"
@ -56,6 +57,7 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
promise.then () =>
@appTitle.set("Backlog - " + @scope.project.name)
tgLoader.pageLoaded()
promise.then null, =>
console.log "FAIL"

2
app/coffee/modules/common/loader.coffee
View File

@ -6,10 +6,12 @@ module = angular.module("taigaCommon")
LoaderDirective = (tgLoader) ->
link = ($scope, $el, $attrs) ->
tgLoader.end () ->
$(document.body).removeClass("loader-active")
$el.removeClass("active")
$scope.$on "$routeChangeSuccess", () ->
tgLoader.start () ->
$(document.body).addClass("loader-active")
$el.addClass("active")

6
app/coffee/modules/issues/list.coffee
View File

@ -46,10 +46,11 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
"$routeParams",
"$q",
"$location",
"$appTitle"
"$appTitle",
"tgLoader"
]
constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @appTitle) ->
constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @appTitle, tgLoader) ->
@scope.sprintId = @params.id
@scope.sectionName = "Issues"
@scope.filters = {}
@ -58,6 +59,7 @@ class IssuesController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
promise.then () =>
@appTitle.set("Issues - " + @scope.project.name)
tgLoader.pageLoaded()
promise.then null, ->
console.log "FAIL" #TODO

6
app/coffee/modules/kanban/main.coffee
View File

@ -44,10 +44,11 @@ class KanbanController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
"$routeParams",
"$q",
"$tgLocation",
"$appTitle"
"$appTitle",
"tgLoader"
]
constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @appTitle) ->
constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @appTitle, tgLoader) ->
_.bindAll(@)
@scope.sectionName = "Kanban"
@ -55,6 +56,7 @@ class KanbanController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.Fi
promise = @.loadInitialData()
promise.then () =>
@appTitle.set("Kanban - " + @scope.project.name)
tgLoader.pageLoaded()
promise.then null, =>
console.log "FAIL"

3
app/styles/layout/base.scss
View File

@ -51,6 +51,9 @@ body {
opacity: .9;
}
}
&.loader-active {
overflow: hidden;
}
&.loading-project {
overflow: hidden;
.projects-nav-overlay {