From dfb52a411584874e1e44d1fa834218fa39b349d9 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Mon, 18 Aug 2014 10:38:59 +0200 Subject: [PATCH] disable auto loader --- app/coffee/app.coffee | 6 +++--- app/coffee/modules/backlog/main.coffee | 6 ++++-- app/coffee/modules/common/loader.coffee | 2 ++ app/coffee/modules/issues/list.coffee | 6 ++++-- app/coffee/modules/kanban/main.coffee | 6 ++++-- app/styles/layout/base.scss | 3 +++ 6 files changed, 20 insertions(+), 9 deletions(-) diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee index e86fb78b..745b3338 100644 --- a/app/coffee/app.coffee +++ b/app/coffee/app.coffee @@ -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"}) diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee index b45411c0..adc4ab0f 100644 --- a/app/coffee/modules/backlog/main.coffee +++ b/app/coffee/modules/backlog/main.coffee @@ -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" diff --git a/app/coffee/modules/common/loader.coffee b/app/coffee/modules/common/loader.coffee index 48188c15..c6b662c7 100644 --- a/app/coffee/modules/common/loader.coffee +++ b/app/coffee/modules/common/loader.coffee @@ -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") diff --git a/app/coffee/modules/issues/list.coffee b/app/coffee/modules/issues/list.coffee index d4b314d6..2093bcb4 100644 --- a/app/coffee/modules/issues/list.coffee +++ b/app/coffee/modules/issues/list.coffee @@ -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 diff --git a/app/coffee/modules/kanban/main.coffee b/app/coffee/modules/kanban/main.coffee index 96006b0c..2769a81c 100644 --- a/app/coffee/modules/kanban/main.coffee +++ b/app/coffee/modules/kanban/main.coffee @@ -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" diff --git a/app/styles/layout/base.scss b/app/styles/layout/base.scss index 1b27fdc5..5572f090 100644 --- a/app/styles/layout/base.scss +++ b/app/styles/layout/base.scss @@ -51,6 +51,9 @@ body { opacity: .9; } } + &.loader-active { + overflow: hidden; + } &.loading-project { overflow: hidden; .projects-nav-overlay {