From 660e89a519df8b325a40357dbf9c39aa19bf1238 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= Date: Tue, 16 Sep 2014 12:44:09 +0200 Subject: [PATCH] Added loading to main pages --- app/coffee/app.coffee | 8 ++++---- app/coffee/modules/taskboard/main.coffee | 8 +++++--- app/coffee/modules/tasks/detail.coffee | 6 ++++-- app/coffee/modules/userstories/detail.coffee | 6 ++++-- app/coffee/modules/wiki/main.coffee | 6 ++++-- 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee index e3cc9698..6b58b9c9 100644 --- a/app/coffee/app.coffee +++ b/app/coffee/app.coffee @@ -29,7 +29,7 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, tgLoade $routeProvider.when("/project/:pslug/backlog", {templateUrl: "/partials/backlog.html", resolve: {loader: tgLoaderProvider.add()}}) $routeProvider.when("/project/:pslug/taskboard/:sslug", - {templateUrl: "/partials/taskboard.html"}) + {templateUrl: "/partials/taskboard.html", resolve: {loader: tgLoaderProvider.add()}}) $routeProvider.when("/project/:pslug/search", {templateUrl: "/partials/search.html", reloadOnSearch: false}) $routeProvider.when("/project/:pslug/kanban", @@ -37,13 +37,13 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, tgLoade # User stories $routeProvider.when("/project/:pslug/us/:usref", - {templateUrl: "/partials/us-detail.html"}) + {templateUrl: "/partials/us-detail.html", resolve: {loader: tgLoaderProvider.add()}}) $routeProvider.when("/project/:pslug/us/:usref/edit", {templateUrl: "/partials/us-detail-edit.html"}) # Tasks $routeProvider.when("/project/:pslug/task/:taskref", - {templateUrl: "/partials/task-detail.html"}) + {templateUrl: "/partials/task-detail.html", resolve: {loader: tgLoaderProvider.add()}}) $routeProvider.when("/project/:pslug/task/:taskref/edit", {templateUrl: "/partials/task-detail-edit.html"}) @@ -51,7 +51,7 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, tgLoade $routeProvider.when("/project/:pslug/wiki", {redirectTo: (params) -> "/project/#{params.pslug}/wiki/home"}, ) $routeProvider.when("/project/:pslug/wiki/:slug", - {templateUrl: "/partials/wiki.html"}) + {templateUrl: "/partials/wiki.html", resolve: {loader: tgLoaderProvider.add()}}) $routeProvider.when("/project/:pslug/wiki/:slug/edit", {templateUrl: "/partials/wiki-edit.html"}) diff --git a/app/coffee/modules/taskboard/main.coffee b/app/coffee/modules/taskboard/main.coffee index 38b3140a..68683b61 100644 --- a/app/coffee/modules/taskboard/main.coffee +++ b/app/coffee/modules/taskboard/main.coffee @@ -43,11 +43,12 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin) "$tgResources", "$routeParams", "$q", - "$appTitle" - "$tgLocation" + "$appTitle", + "$tgLocation", + "tgLoader" ] - constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @appTitle, @location) -> + constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @appTitle, @location, tgLoader) -> _.bindAll(@) @scope.sectionName = "Taskboard" @@ -57,6 +58,7 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin) # On Success promise.then => @appTitle.set("Taskboard - " + @scope.project.name) + tgLoader.pageLoaded() # On Error promise.then null, (xhr) => diff --git a/app/coffee/modules/tasks/detail.coffee b/app/coffee/modules/tasks/detail.coffee index 8b62037f..326c55d8 100644 --- a/app/coffee/modules/tasks/detail.coffee +++ b/app/coffee/modules/tasks/detail.coffee @@ -42,10 +42,11 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin) "$tgLocation", "$log", "$appTitle", - "$tgNavUrls" + "$tgNavUrls", + "tgLoader" ] - constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @log, @appTitle, @navUrls) -> + constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @log, @appTitle, @navUrls, tgLoader) -> @scope.taskRef = @params.taskref @scope.sectionName = "Task Details" @@ -53,6 +54,7 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin) promise.then () => @appTitle.set(@scope.task.subject + " - " + @scope.project.name) + tgLoader.pageLoaded() promise.then null, -> console.log "FAIL" #TODO diff --git a/app/coffee/modules/userstories/detail.coffee b/app/coffee/modules/userstories/detail.coffee index c821425e..66781b18 100644 --- a/app/coffee/modules/userstories/detail.coffee +++ b/app/coffee/modules/userstories/detail.coffee @@ -43,10 +43,11 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin) "$tgLocation", "$log", "$appTitle", - "$tgNavUrls" + "$tgNavUrls", + "tgLoader" ] - constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @log, @appTitle, @navUrls) -> + constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @log, @appTitle, @navUrls, tgLoader) -> @scope.issueRef = @params.issueref @scope.sectionName = "User Story Details" @@ -55,6 +56,7 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin) # On Success promise.then => @appTitle.set(@scope.us.subject + " - " + @scope.project.name) + tgLoader.pageLoaded() # On Error promise.then null, (xhr) => diff --git a/app/coffee/modules/wiki/main.coffee b/app/coffee/modules/wiki/main.coffee index 49d188a7..b28c6d5d 100644 --- a/app/coffee/modules/wiki/main.coffee +++ b/app/coffee/modules/wiki/main.coffee @@ -45,11 +45,12 @@ class WikiDetailController extends mixOf(taiga.Controller, taiga.PageMixin) "$filter", "$log", "$appTitle", - "$tgNavUrls" + "$tgNavUrls", + "tgLoader" ] constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @filter, @log, @appTitle, - @navUrls) -> + @navUrls, tgLoader) -> @scope.projectSlug = @params.pslug @scope.wikiSlug = @params.slug @scope.sectionName = "Wiki" @@ -59,6 +60,7 @@ class WikiDetailController extends mixOf(taiga.Controller, taiga.PageMixin) # On Success promise.then () => @appTitle.set("Wiki - " + @scope.project.name) + tgLoader.pageLoaded() # On Error promise.then null, (xhr) =>