From 2575218ddb7f296a2d0670812d45d17a8d58263e Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Fri, 12 Oct 2012 18:32:25 +0200 Subject: [PATCH] Fix logs to always point to build or job view --- assets/scripts/app/helpers/handlebars.coffee | 5 +++- assets/scripts/app/helpers/helpers.coffee | 11 +++++++-- assets/scripts/app/routes.coffee | 12 +++++++-- assets/scripts/app/templates/jobs/log.hbs | 2 +- assets/scripts/app/views/build.coffee | 2 ++ assets/scripts/app/views/job.coffee | 26 ++++++++++++++++---- assets/scripts/lib/travis/log.coffee | 11 +++++---- public/scripts/app.js | 2 +- public/scripts/min/app.js | 2 +- 9 files changed, 55 insertions(+), 18 deletions(-) diff --git a/assets/scripts/app/helpers/handlebars.coffee b/assets/scripts/app/helpers/handlebars.coffee index 63471d9d..be5468b5 100644 --- a/assets/scripts/app/helpers/handlebars.coffee +++ b/assets/scripts/app/helpers/handlebars.coffee @@ -31,5 +31,8 @@ Ember.registerBoundHelper 'formatConfig', (config, options) -> safe Travis.Helpers.formatConfig(config) Ember.registerBoundHelper 'formatLog', (log, options) -> - Travis.Helpers.formatLog(log) || '' + parentView = @get 'parentView' + repo = parentView.get(options.repo) + item = parentView.get(options.item) + Travis.Helpers.formatLog(log, repo, item) || '' diff --git a/assets/scripts/app/helpers/helpers.coffee b/assets/scripts/app/helpers/helpers.coffee index eb6ad5cf..b533a306 100644 --- a/assets/scripts/app/helpers/helpers.coffee +++ b/assets/scripts/app/helpers/helpers.coffee @@ -31,8 +31,15 @@ require 'config/emoij' message = message.split(/\n/)[0] if options.short @_emojize(@_escape(message)).replace /\n/g, '
' - formatLog: (log) -> - Travis.Log.filter(log) + formatLog: (log, repo, item) -> + event = if item.constructor == Travis.Build + 'showBuild' + else + 'showJob' + + url = Travis.app.get('router').urlForEvent(event, repo, item) + + Travis.Log.filter(log, url) pathFrom: (url) -> (url || '').split('/').pop() diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index a626abd9..6992d80c 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -7,6 +7,9 @@ defaultRoute = Ember.Route.extend lineNumberRoute = Ember.Route.extend route: '#L:number' index: 1 + connectOutlets: (router) -> + router.saveLineNumberHash() + routeMatcher: Ember.computed(-> if route = @get 'route' Ember._RouteMatcher.create @@ -127,6 +130,12 @@ Travis.Router = Ember.Router.extend showAccount: Ember.Route.transitionTo('root.profile.account') showUserProfile: Ember.Route.transitionTo('root.profile.account.profile') + saveLineNumberHash: (path) -> + Ember.run.next this, -> + path = path || @get('location').getURL() + if match = path.match(/#L\d+$/) + @set 'repoController.lineNumberHash', match[0] + reload: -> url = @get('location').getURL() @transitionTo 'loading' @@ -143,8 +152,7 @@ Travis.Router = Ember.Router.extend loading: Ember.Route.extend routePath: (router, path) -> - if match = path.match(/#.*$/) - router.set 'lineNumberHash', match[0] + router.saveLineNumberHash(path) sessionStorage.setItem('travis.path', path) if router.needsAuth(path) diff --git a/assets/scripts/app/templates/jobs/log.hbs b/assets/scripts/app/templates/jobs/log.hbs index 88df22ef..80652414 100644 --- a/assets/scripts/app/templates/jobs/log.hbs +++ b/assets/scripts/app/templates/jobs/log.hbs @@ -4,7 +4,7 @@

     
     
-  {{{formatLog log.body}}}
+ {{{formatLog log.body repo="repository" item="parentView.currentItem"}}} {{#if sponsor.name}}

%@%@

\n'.fmt(path, path, number, number, line) + pathWithNumber = "#{path}#L#{number}" + result += '

%@%@

\n'.fmt(pathWithNumber, number, number, number, line) result.trim() deansi: (log) -> diff --git a/public/scripts/app.js b/public/scripts/app.js index 3f52010d..962223b5 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: $('