suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix routing to build/job when object is already loaded

Browse Source
This commit is contained in:
Piotr Sarnacki 2012-10-12 18:46:27 +02:00
parent 2575218ddb
commit 87bccccde8
4 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/scripts/app/routes.coffee
View File

@ -356,6 +356,10 @@ Travis.Router = Ember.Router.extend
# record. # record.
# TODO: find out why it happens # TODO: find out why it happens
build = Travis.Build.find params.build_id build = Travis.Build.find params.build_id
if build.get 'id'
build
else
deferred = $.Deferred() deferred = $.Deferred()
observer = -> observer = ->
@ -402,6 +406,10 @@ Travis.Router = Ember.Router.extend
deserialize: (router, params) -> deserialize: (router, params) ->
job = Travis.Job.find params.job_id job = Travis.Job.find params.job_id
if job.get 'id'
job
else
deferred = $.Deferred() deferred = $.Deferred()
observer = -> observer = ->

1
assets/scripts/app/views/job.coffee
View File

@ -81,6 +81,7 @@
target = $(event.target) target = $(event.target)
target.closest('.fold').toggleClass('open') target.closest('.fold').toggleClass('open')
if target.is('.log-line-number') if target.is('.log-line-number')
path = target.attr 'href' path = target.attr 'href'
Travis.app.get('router').route(path) Travis.app.get('router').route(path)

2
public/scripts/app.js
View File

File diff suppressed because one or more lines are too long

2
public/scripts/min/app.js
View File

File diff suppressed because one or more lines are too long