From 37523b3c07970c48d43433b28fe55cd1f6c68907 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Sat, 7 Jul 2012 04:26:58 +0200 Subject: [PATCH] cleanup --- assets/javascripts/app/controllers.coffee | 8 -- .../javascripts/app/controllers/base.coffee | 2 +- .../app/controllers/repository.coffee | 92 +++++++++---------- .../javascripts/app/templates/builds/list.hbs | 60 ++++++------ assets/javascripts/app/views/build.coffee | 2 +- assets/javascripts/vendor/ember.js | 2 - public/javascripts/application.js | 2 +- public/javascripts/vendor.js | 2 - 8 files changed, 78 insertions(+), 92 deletions(-) diff --git a/assets/javascripts/app/controllers.coffee b/assets/javascripts/app/controllers.coffee index ca08e526..73b24f3b 100644 --- a/assets/javascripts/app/controllers.coffee +++ b/assets/javascripts/app/controllers.coffee @@ -12,14 +12,6 @@ Travis.reopen repositoryBinding: 'parent.repository' contentBinding: 'parent.builds' - BuildController: Em.Controller.extend - repositoryBinding: 'layout.repository' - buildBinding: 'layout.build' - - JobController: Em.Controller.extend - repositoryBinding: 'layout.repository' - jobBinding: 'layout.job' - QueuesController: Em.ArrayController.extend() UserController: Em.Controller.extend() HooksController: Em.ArrayController.extend() diff --git a/assets/javascripts/app/controllers/base.coffee b/assets/javascripts/app/controllers/base.coffee index b0368f71..c780da8c 100644 --- a/assets/javascripts/app/controllers/base.coffee +++ b/assets/javascripts/app/controllers/base.coffee @@ -3,7 +3,7 @@ Travis.Controller = Em.Controller.extend for name in Array.prototype.slice.apply(arguments) name = "#{$.camelize(name, false)}Controller" klass = Travis[$.camelize(name)] || Em.Controller - this[name] = klass.create(namespace: Travis, controllers: this) + this[name] = klass.create(parent: this, namespace: Travis, controllers: this) connect: (parent) -> parent.connectOutlet diff --git a/assets/javascripts/app/controllers/repository.coffee b/assets/javascripts/app/controllers/repository.coffee index a615e58c..ac90788a 100644 --- a/assets/javascripts/app/controllers/repository.coffee +++ b/assets/javascripts/app/controllers/repository.coffee @@ -1,61 +1,61 @@ Travis.RepositoryController = Travis.Controller.extend - bindings: [] + bindings: [] - init: -> - @_super('builds', 'build', 'job') + init: -> + @_super('builds', 'build', 'job') - activate: (action, params) -> - @_unbind() - @set('params', params) - this["view#{$.camelize(action)}"]() + activate: (action, params) -> + @_unbind() + this["view#{$.camelize(action)}"]() + @set('params', params) - viewIndex: -> - @_bind('repository', 'controllers.repositoriesController.firstObject') - @_bind('build', 'repository.lastBuild') - @connectTab('current') + viewIndex: -> + @connectTab('current') + @_bind('repository', 'controllers.repositoriesController.firstObject') + @_bind('build', 'repository.lastBuild') - viewCurrent: -> - @_bind('repository', 'repositoriesByParams.firstObject') - @_bind('build', 'repository.lastBuild') - @connectTab('current') + viewCurrent: -> + @connectTab('current') + @_bind('repository', 'repositoriesByParams.firstObject') + @_bind('build', 'repository.lastBuild') - viewBuilds: -> - @_bind('repository', 'repositoriesByParams.firstObject') - @_bind('builds', 'repository.builds') - @connectTab('builds') + viewBuilds: -> + @connectTab('builds') + @_bind('repository', 'repositoriesByParams.firstObject') + @_bind('builds', 'repository.builds') - viewBuild: -> - @_bind('repository', 'repositoriesByParams.firstObject') - @_bind('build', 'buildById') - @connectTab('build') + viewBuild: -> + @connectTab('build') + @_bind('repository', 'repositoriesByParams.firstObject') + @_bind('build', 'buildById') - viewJob: -> - @_bind('repository', 'repositoriesByParams.firstObject') - @_bind('build', 'job.build') - @_bind('job', 'jobById') - @connectTab('job') + viewJob: -> + @connectTab('job') + @_bind('repository', 'repositoriesByParams.firstObject') + @_bind('build', 'job.build') + @_bind('job', 'jobById') - repositoriesByParams: (-> - Travis.Repository.bySlug("#{params.owner}/#{params.name}") if params = @get('params') - ).property('params') + repositoriesByParams: (-> + Travis.Repository.bySlug("#{params.owner}/#{params.name}") if params = @get('params') + ).property('params') - buildById: (-> - Travis.Build.find(id) if id = @getPath('params.id') - ).property('params.id') + buildById: (-> + Travis.Build.find(id) if id = @getPath('params.id') + ).property('params.id') - jobById: (-> - Travis.Job.find(id) if id = @getPath('params.id') - ).property('params.id') + jobById: (-> + Travis.Job.find(id) if id = @getPath('params.id') + ).property('params.id') - connectTab: (tab) -> - @set('tab', tab) - name = if tab == 'current' then 'build' else tab - @connectOutlet(outletName: 'pane', name: name) + connectTab: (tab) -> + @set('tab', tab) + name = if tab == 'current' then 'build' else tab + @connectOutlet(outletName: 'pane', controller: this, viewClass: Travis["#{$.camelize(name)}View"]) - _bind: (to, from) -> - @bindings.push Ember.oneWay(this, to, from) + _bind: (to, from) -> + @bindings.push Ember.oneWay(this, to, from) - _unbind: -> - binding.disconnect(this) for binding in @bindings - @bindings.length = 0 + _unbind: -> + binding.disconnect(this) for binding in @bindings + @bindings.length = 0 diff --git a/assets/javascripts/app/templates/builds/list.hbs b/assets/javascripts/app/templates/builds/list.hbs index 01cd354c..77102750 100644 --- a/assets/javascripts/app/templates/builds/list.hbs +++ b/assets/javascripts/app/templates/builds/list.hbs @@ -1,37 +1,35 @@ {{#if builds.isLoaded}} - {{#with view}} - - - - - - - - - - +
{{t builds.name}}{{t builds.commit}}{{t builds.message}}{{t builds.duration}}{{t builds.finished_at}}
+ + + + + + + + + - - {{#each build in builds}} - {{#view Travis.BuildsItemView contextBinding="build"}} - - - - - - - - {{/view}} - {{/each}} - -
{{t builds.name}}{{t builds.commit}}{{t builds.message}}{{t builds.duration}}{{t builds.finished_at}}
{{number}}{{formatCommit commit}}{{{formatMessage commit.message short="true"}}}{{formatDuration duration}}{{formatTime finished_at}}
+ + {{#each build in builds}} + {{#view Travis.BuildsItemView contextBinding="build"}} + + {{number}} + {{formatCommit commit}} + {{{formatMessage commit.message short="true"}}} + {{formatDuration duration}} + {{formatTime finishedAt}} + + {{/view}} + {{/each}} + + -

- -

- {{/with}} +

+ +

{{else}}
Loading diff --git a/assets/javascripts/app/views/build.coffee b/assets/javascripts/app/views/build.coffee index 34eb70bc..1a4ef1d7 100644 --- a/assets/javascripts/app/views/build.coffee +++ b/assets/javascripts/app/views/build.coffee @@ -9,7 +9,7 @@ commitBinding: 'build.commit' color: (-> - Travis.Helpers.colorForResult(@getPath('context.result')) + Travis.Helpers.colorForResult(@getPath('build.result')) ).property('build.result') urlBuild: (-> diff --git a/assets/javascripts/vendor/ember.js b/assets/javascripts/vendor/ember.js index 378bd8bd..13f0a8c9 100644 --- a/assets/javascripts/vendor/ember.js +++ b/assets/javascripts/vendor/ember.js @@ -11520,8 +11520,6 @@ Ember.ControllerMixin.reopen({ var viewClassName = name.charAt(0).toUpperCase() + name.substr(1) + "View"; viewClass = get(namespace, viewClassName); - controller = get(controllers, name + 'Controller'); - Ember.assert("The name you supplied " + name + " did not resolve to a view " + viewClassName, !!viewClass); Ember.assert("The name you supplied " + name + " did not resolve to a controller " + name + 'Controller', (!!controller && !!context) || !context); } diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 9ce8d1e8..976b2da6 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1 +1 @@ -minispade.register('templates', "(function() {Ember.TEMPLATES['builds/list']=Ember.Handlebars.compile(\"{{#if builds.isLoaded}}\\n {{#with view}}\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n\\n \\n {{#each build in builds}}\\n {{#view Travis.BuildsItemView contextBinding=\\\"build\\\"}}\\n \\n \\n \\n \\n \\n \\n \\n {{/view}}\\n {{/each}}\\n \\n
{{t builds.name}}{{t builds.commit}}{{t builds.message}}{{t builds.duration}}{{t builds.finished_at}}
{{number}}{{formatCommit commit}}{{{formatMessage commit.message short=\\\"true\\\"}}}{{formatDuration duration}}{{formatTime finished_at}}
\\n\\n

\\n \\n

\\n {{/with}}\\n{{else}}\\n
\\n Loading\\n
\\n{{/if}}\\n\");Ember.TEMPLATES['builds/show']=Ember.Handlebars.compile(\"{{#with view}}\\n {{#if build.isLoaded}}\\n
\\n
\\n
\\n
{{t builds.name}}
\\n
{{build.number}}
\\n
{{t builds.finished_at}}
\\n
{{formatTime build.finished_at}}
\\n
{{t builds.duration}}
\\n
{{formatDuration build.duration}}
\\n
\\n\\n
\\n
{{t builds.commit}}
\\n
{{formatCommit build.commit}}
\\n {{#if commit.compareUrl}}\\n
{{t builds.compare}}
\\n
{{pathFrom build.commit.compareUrl}}
\\n {{/if}}\\n {{#if commit.authorName}}\\n
{{t builds.author}}
\\n
{{build.commit.authorName}}
\\n {{/if}}\\n {{#if commit.committerName}}\\n
{{t builds.committer}}
\\n
{{build.commit.committerName}}
\\n {{/if}}\\n
\\n\\n
{{t builds.message}}
\\n
{{{formatMessage build.commit.message}}}
\\n\\n {{#unless isMatrix}}\\n
{{t builds.config}}
\\n
{{formatConfig build.config}}
\\n {{/unless}}\\n
\\n\\n {{#if build.isMatrix}}\\n {{view Travis.JobsView jobsBinding=\\\"requiredJobs\\\" required=\\\"true\\\"}}\\n {{view Travis.JobsView jobsBinding=\\\"allowedFailureJobs\\\"}}\\n {{else}}\\n {{view Travis.LogView contextBinding=\\\"build.jobs.firstObject\\\"}}\\n {{/if}}\\n
\\n {{else}}\\n
\\n Loading\\n
\\n {{/if}}\\n{{/with}}\\n\");Ember.TEMPLATES['jobs/list']=Ember.Handlebars.compile(\"{{#with view}}\\n {{#if jobs.length}}\\n {{#if required}}\\n \\n \\n {{else}}\\n
\\n {{t jobs.build_matrix}}\\n
\\n \\n {{/if}}\\n \\n \\n {{#each build.configKeys}}\\n \\n {{/each}}\\n \\n \\n \\n {{#each job in jobs}}\\n {{#view Travis.JobsItemView contextBinding=\\\"job\\\"}}\\n \\n \\n \\n \\n {{#each configValues}}\\n \\n {{/each}}\\n \\n {{/view}}\\n {{/each}}\\n \\n
\\n {{t jobs.allowed_failures}}\\n \\n
{{this}}
{{number}}{{formatDuration duration}}{{formatTime finished_at}}{{this}}
\\n\\n {{#unless required}}\\n
\\n
{{t \\\"jobs.allowed_failures\\\"}}
\\n
\\n

\\n Allowed Failures are items in your build matrix that are allowed to\\n fail without causing the entire build to be shown as failed. This lets you add\\n in experimental and preparatory builds to test against versions or\\n configurations that you are not ready to officially support.\\n

\\n

\\n You can define allowed failures in the build matrix as follows:\\n

\\n 
 matrix:\\n    allow_failures:\\n      - rvm: ruby-head
\\n
\\n
\\n {{/unless}}\\n {{/if}}\\n{{/with}}\\n\");Ember.TEMPLATES['jobs/log']=Ember.Handlebars.compile(\"
{{{formatLog log.body}}}
\\n\\n{{#if sponsor.name}}\\n

\\n {{t builds.messages.sponsored_by}}\\n {{sponsor.name}}\\n

\\n{{/if}}\\n\");Ember.TEMPLATES['jobs/show']=Ember.Handlebars.compile(\"{{#with view}}\\n {{#if job.isLoaded}}\\n
\\n
\\n
\\n
Job
\\n
{{job.number}}
\\n
{{t jobs.finished_at}}
\\n
{{formatTime job.finished_at}}
\\n
{{t jobs.duration}}
\\n
{{formatDuration job.duration}}
\\n
\\n\\n
\\n
{{t jobs.commit}}
\\n
{{formatCommit commit}}
\\n {{#if commit.compareUrl}}\\n
{{t jobs.compare}}
\\n
{{pathFrom commit.compareUrl}}
\\n {{/if}}\\n {{#if commit.authorName}}\\n
{{t jobs.author}}
\\n
{{commit.authorName}}
\\n {{/if}}\\n {{#if commit.committerName}}\\n
{{t jobs.committer}}
\\n
{{commit.committerName}}
\\n {{/if}}\\n
\\n\\n
{{t jobs.message}}
\\n
{{formatMessage commit.message}}
\\n
{{t jobs.config}}
\\n
{{formatConfig job.config}}
\\n
\\n\\n {{view Travis.LogView contextBinding=\\\"job\\\"}}}\\n
\\n {{/if}}\\n{{/with}}\\n\");Ember.TEMPLATES['layouts/home']=Ember.Handlebars.compile(\"
\\n {{outlet top}}\\n
\\n\\n
\\n
\\n \\n
\\n\\n \\n\\n
\\n {{outlet left}}\\n
\\n
\\n\\n
\\n {{outlet main}}\\n\\n
\\n {{outlet right}}\\n
\\n
\\n\\n\");Ember.TEMPLATES['layouts/sidebar']=Ember.Handlebars.compile(\"\\n {{t layouts.application.fork_me}}\\n\\n\\n
\\n
 \\n
\\n\\n{{outlet decks}}\\n{{outlet workers}}\\n{{outlet queues}}\\n{{outlet links}}\\n\\n
\\n

{{t layouts.about.alpha}}

\\n

{{{t layouts.about.messages.alpha}}}

\\n
\\n\\n
\\n

{{t layouts.about.join}}

\\n \\n
\\n\");Ember.TEMPLATES['layouts/simple']=Ember.Handlebars.compile(\"
\\n {{outlet top}}\\n
\\n\\n
\\n {{outlet main}}\\n
\\n\\n\");Ember.TEMPLATES['layouts/top']=Ember.Handlebars.compile(\"\\n

Travis

\\n\\n\\n\\n\");Ember.TEMPLATES['profile/hooks']=Ember.Handlebars.compile(\"{{#if content.length}}\\n \\n{{else}}\\n

Please wait while we sync with GitHub

\\n{{/if}}\\n\\n\");Ember.TEMPLATES['profile/show']=Ember.Handlebars.compile(\"

{{name}}

\\n\\n\\n
\\n
\\n {{t profiles.show.github}}:\\n
\\n
\\n {{login}}\\n
\\n
\\n {{t profiles.show.email}}:\\n
\\n
\\n {{email}}\\n
\\n
\\n {{t profiles.show.token}}:\\n
\\n
\\n {{token}}\\n
\\n
\\n\\n

\\n {{{t profiles.show.messages.notice}}}\\n

\\n\\n

{{t profiles.show.your_locale}}

\\n
\\n \\n \\n
\\n\\n

{{t profiles.show.your_repos}}

\\n

\\n {{{t profiles.show.message.your_repos}}}\\n \\n {{{t profiles.show.message.config}}}\\n \\n

\\n\\n{{outlet hooks}}\\n\");Ember.TEMPLATES['queues/list']=Ember.Handlebars.compile(\"{{#each queue in controller}}\\n

{{t queue}}: {{queue.name}}

\\n \\n{{/each}}\\n\");Ember.TEMPLATES['repositories/_tabs']=Ember.Handlebars.compile(\"\\n\\n
\\n \\n
\\n

\\n

\\n

\\n

\\n

\\n
\\n
\\n\");Ember.TEMPLATES['repositories/list']=Ember.Handlebars.compile(\"