From 87bccccde8ed74435f58a6490f026cc73410695c Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 12 Oct 2012 18:46:27 +0200 Subject: [PATCH] Fix routing to build/job when object is already loaded --- assets/scripts/app/routes.coffee | 36 ++++++++++++++++++----------- assets/scripts/app/views/job.coffee | 1 + public/scripts/app.js | 2 +- public/scripts/min/app.js | 2 +- 4 files changed, 25 insertions(+), 16 deletions(-) diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index 6992d80c..0339ca2f 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -356,16 +356,20 @@ Travis.Router = Ember.Router.extend # record. # TODO: find out why it happens build = Travis.Build.find params.build_id - deferred = $.Deferred() - observer = -> - if build.get 'id' - build.removeObserver 'id', observer - deferred.resolve build + if build.get 'id' + build + else + deferred = $.Deferred() - build.addObserver 'id', observer + observer = -> + if build.get 'id' + build.removeObserver 'id', observer + deferred.resolve build - deferred.promise() + build.addObserver 'id', observer + + deferred.promise() # TODO: this is not dry, but for some weird # reason Mixins don't play nice with Ember.Route @@ -402,14 +406,18 @@ Travis.Router = Ember.Router.extend deserialize: (router, params) -> job = Travis.Job.find params.job_id - deferred = $.Deferred() - observer = -> - if job.get 'id' - job.removeObserver 'id', observer - deferred.resolve job - job.addObserver 'id', observer - deferred.promise() + if job.get 'id' + job + else + deferred = $.Deferred() + + observer = -> + if job.get 'id' + job.removeObserver 'id', observer + deferred.resolve job + job.addObserver 'id', observer + deferred.promise() initialState: 'default' default: defaultRoute diff --git a/assets/scripts/app/views/job.coffee b/assets/scripts/app/views/job.coffee index e75c620b..f13bfb19 100644 --- a/assets/scripts/app/views/job.coffee +++ b/assets/scripts/app/views/job.coffee @@ -81,6 +81,7 @@ target = $(event.target) target.closest('.fold').toggleClass('open') + if target.is('.log-line-number') path = target.attr 'href' Travis.app.get('router').route(path) diff --git a/public/scripts/app.js b/public/scripts/app.js index 962223b5..27f2494f 100644 --- a/public/scripts/app.js +++ b/public/scripts/app.js @@ -29619,4 +29619,4 @@ var _require=function(){function c(a,c){document.addEventListener?a.addEventList ++g&&setTimeout(c,0)})}}(); (function(){!window.WebSocket&&window.MozWebSocket&&(window.WebSocket=window.MozWebSocket);if(window.WebSocket)Pusher.Transport=window.WebSocket,Pusher.TransportType="native";var c=(document.location.protocol=="http:"?Pusher.cdn_http:Pusher.cdn_https)+Pusher.VERSION,a=[];window.JSON||a.push(c+"/json2"+Pusher.dependency_suffix+".js");if(!window.WebSocket)window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION=!0,a.push(c+"/flashfallback"+Pusher.dependency_suffix+".js");var b=function(){return window.WebSocket?function(){Pusher.ready()}: function(){window.WebSocket?(Pusher.Transport=window.WebSocket,Pusher.TransportType="flash",window.WEB_SOCKET_SWF_LOCATION=c+"/WebSocketMain.swf",WebSocket.__addTask(function(){Pusher.ready()}),WebSocket.__initialize()):(Pusher.Transport=null,Pusher.TransportType="none",Pusher.ready())}}(),e=function(a){var b=function(){document.body?a():setTimeout(b,0)};b()},g=function(){e(b)};a.length>0?_require(a,g):g()})(); -;minispade.register('app', "(function() {(function() {\nminispade.require('auth');\nminispade.require('controllers');\nminispade.require('helpers');\nminispade.require('models');\nminispade.require('pusher');\nminispade.require('routes');\nminispade.require('slider');\nminispade.require('store');\nminispade.require('tailing');\nminispade.require('templates');\nminispade.require('views');\nminispade.require('config/locales');\nminispade.require('data/sponsors');\n\n Travis.reopen({\n App: Em.Application.extend({\n autoinit: false,\n currentUserBinding: 'auth.user',\n authStateBinding: 'auth.state',\n init: function() {\n this._super.apply(this, arguments);\n this.store = Travis.Store.create();\n this.store.loadMany(Travis.Sponsor, Travis.SPONSORS);\n this.set('auth', Travis.Auth.create({\n app: this,\n endpoint: Travis.config.api_endpoint\n }));\n this.slider = new Travis.Slider();\n this.pusher = new Travis.Pusher(Travis.config.pusher_key);\n return this.tailing = new Travis.Tailing();\n },\n signIn: function() {\n return this.get('auth').signIn();\n },\n signOut: function() {\n this.get('auth').signOut();\n return this.get('router').send('showRoot');\n },\n receive: function() {\n return this.store.receive.apply(this.store, arguments);\n },\n toggleSidebar: function() {\n var element;\n $('body').toggleClass('maximized');\n element = $('');\n $('#top .profile').append(element);\n Em.run.later((function() {\n return element.remove();\n }), 10);\n element = $('');\n $('#repo').append(element);\n return Em.run.later((function() {\n return element.remove();\n }), 10);\n }\n })\n });\n\n}).call(this);\n\n})();\n//@ sourceURL=app");minispade.register('auth', "(function() {(function() {\n\n this.Travis.Auth = Ember.Object.extend({\n iframe: $('