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

Added loading to main pages

stable
Xavier Julián 2014-09-16 12:44:09 +02:00
parent 58c9124342
commit 660e89a519
5 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/coffee/app.coffee
View File

@ -29,7 +29,7 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, tgLoade
$routeProvider.when("/project/:pslug/backlog", $routeProvider.when("/project/:pslug/backlog",
{templateUrl: "/partials/backlog.html", resolve: {loader: tgLoaderProvider.add()}}) {templateUrl: "/partials/backlog.html", resolve: {loader: tgLoaderProvider.add()}})
$routeProvider.when("/project/:pslug/taskboard/:sslug", $routeProvider.when("/project/:pslug/taskboard/:sslug",
{templateUrl: "/partials/taskboard.html"}) {templateUrl: "/partials/taskboard.html", resolve: {loader: tgLoaderProvider.add()}})
$routeProvider.when("/project/:pslug/search", $routeProvider.when("/project/:pslug/search",
{templateUrl: "/partials/search.html", reloadOnSearch: false}) {templateUrl: "/partials/search.html", reloadOnSearch: false})
$routeProvider.when("/project/:pslug/kanban", $routeProvider.when("/project/:pslug/kanban",
@ -37,13 +37,13 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, tgLoade
# User stories # User stories
$routeProvider.when("/project/:pslug/us/:usref", $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", $routeProvider.when("/project/:pslug/us/:usref/edit",
{templateUrl: "/partials/us-detail-edit.html"}) {templateUrl: "/partials/us-detail-edit.html"})
# Tasks # Tasks
$routeProvider.when("/project/:pslug/task/:taskref", $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", $routeProvider.when("/project/:pslug/task/:taskref/edit",
{templateUrl: "/partials/task-detail-edit.html"}) {templateUrl: "/partials/task-detail-edit.html"})
@ -51,7 +51,7 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, tgLoade
$routeProvider.when("/project/:pslug/wiki", $routeProvider.when("/project/:pslug/wiki",
{redirectTo: (params) -> "/project/#{params.pslug}/wiki/home"}, ) {redirectTo: (params) -> "/project/#{params.pslug}/wiki/home"}, )
$routeProvider.when("/project/:pslug/wiki/:slug", $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", $routeProvider.when("/project/:pslug/wiki/:slug/edit",
{templateUrl: "/partials/wiki-edit.html"}) {templateUrl: "/partials/wiki-edit.html"})

8
app/coffee/modules/taskboard/main.coffee
View File

@ -43,11 +43,12 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin)
"$tgResources", "$tgResources",
"$routeParams", "$routeParams",
"$q", "$q",
"$appTitle" "$appTitle",
"$tgLocation" "$tgLocation",
"tgLoader"
] ]
constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @appTitle, @location) -> constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @appTitle, @location, tgLoader) ->
_.bindAll(@) _.bindAll(@)
@scope.sectionName = "Taskboard" @scope.sectionName = "Taskboard"
@ -57,6 +58,7 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin)
# On Success # On Success
promise.then => promise.then =>
@appTitle.set("Taskboard - " + @scope.project.name) @appTitle.set("Taskboard - " + @scope.project.name)
tgLoader.pageLoaded()
# On Error # On Error
promise.then null, (xhr) => promise.then null, (xhr) =>

6
app/coffee/modules/tasks/detail.coffee
View File

@ -42,10 +42,11 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
"$tgLocation", "$tgLocation",
"$log", "$log",
"$appTitle", "$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.taskRef = @params.taskref
@scope.sectionName = "Task Details" @scope.sectionName = "Task Details"
@ -53,6 +54,7 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
promise.then () => promise.then () =>
@appTitle.set(@scope.task.subject + " - " + @scope.project.name) @appTitle.set(@scope.task.subject + " - " + @scope.project.name)
tgLoader.pageLoaded()
promise.then null, -> promise.then null, ->
console.log "FAIL" #TODO console.log "FAIL" #TODO

6
app/coffee/modules/userstories/detail.coffee
View File

@ -43,10 +43,11 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
"$tgLocation", "$tgLocation",
"$log", "$log",
"$appTitle", "$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.issueRef = @params.issueref
@scope.sectionName = "User Story Details" @scope.sectionName = "User Story Details"
@ -55,6 +56,7 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
# On Success # On Success
promise.then => promise.then =>
@appTitle.set(@scope.us.subject + " - " + @scope.project.name) @appTitle.set(@scope.us.subject + " - " + @scope.project.name)
tgLoader.pageLoaded()
# On Error # On Error
promise.then null, (xhr) => promise.then null, (xhr) =>

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

@ -45,11 +45,12 @@ class WikiDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
"$filter", "$filter",
"$log", "$log",
"$appTitle", "$appTitle",
"$tgNavUrls" "$tgNavUrls",
"tgLoader"
] ]
constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @filter, @log, @appTitle, constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @filter, @log, @appTitle,
@navUrls) -> @navUrls, tgLoader) ->
@scope.projectSlug = @params.pslug @scope.projectSlug = @params.pslug
@scope.wikiSlug = @params.slug @scope.wikiSlug = @params.slug
@scope.sectionName = "Wiki" @scope.sectionName = "Wiki"
@ -59,6 +60,7 @@ class WikiDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
# On Success # On Success
promise.then () => promise.then () =>
@appTitle.set("Wiki - " + @scope.project.name) @appTitle.set("Wiki - " + @scope.project.name)
tgLoader.pageLoaded()
# On Error # On Error
promise.then null, (xhr) => promise.then null, (xhr) =>