From 00cfe41cc5d9ee1cf35873e5f7051aded9a1c8ff Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Tue, 17 Jul 2012 11:54:06 +0200 Subject: [PATCH] stuff --- .../javascripts/app/controllers/home.coffee | 1 - .../app/controllers/repository.coffee | 7 +- .../app/templates/repositories/show.hbs | 24 +- .../app/templates/workers/list.hbs | 2 +- assets/javascripts/app/views/repo.coffee | 4 + assets/javascripts/lib/mocks.coffee | 33 +- assets/javascripts/spec/build_spec.coffee | 1 + assets/javascripts/spec/event_spec.coffee | 34 +- assets/javascripts/spec/sidebar_spec.coffee | 11 + .../spec/support/conditions.coffee | 13 +- .../spec/support/expectations.coffee | 37 +- assets/javascripts/vendor/ember-data.js | 1 + assets/stylesheets/application.sass | 3 + public/javascripts/application.js | 2 +- public/javascripts/specs/specs.js | 74 +- public/javascripts/vendor.js | 2666 ++++++++--------- public/stylesheets/application.css | 20 +- 17 files changed, 1471 insertions(+), 1462 deletions(-) create mode 100644 assets/javascripts/spec/sidebar_spec.coffee diff --git a/assets/javascripts/app/controllers/home.coffee b/assets/javascripts/app/controllers/home.coffee index 4adc1c9d..62d30e91 100644 --- a/assets/javascripts/app/controllers/home.coffee +++ b/assets/javascripts/app/controllers/home.coffee @@ -1,6 +1,5 @@ Travis.HomeController = Travis.Controller.extend name: 'home' - bindings: [] init: -> @_super('top', 'repositories', 'repository', 'sidebar') diff --git a/assets/javascripts/app/controllers/repository.coffee b/assets/javascripts/app/controllers/repository.coffee index d713fd00..5adf864d 100644 --- a/assets/javascripts/app/controllers/repository.coffee +++ b/assets/javascripts/app/controllers/repository.coffee @@ -49,10 +49,9 @@ Travis.RepositoryController = Travis.Controller.extend ).property('params.id') connectTab: (tab) -> - unless tab == @get('tab') - @set('tab', tab) - name = if tab == 'current' then 'build' else tab - @connectOutlet(outletName: 'pane', controller: this, viewClass: Travis["#{$.camelize(name)}View"]) + @set('tab', tab) + name = if tab == 'current' then 'build' else tab + @connectOutlet(outletName: 'pane', controller: this, viewClass: Travis["#{$.camelize(name)}View"]) setParams: (params) -> # TODO if we just @set('params', params) it will update the repositoriesByParams property diff --git a/assets/javascripts/app/templates/repositories/show.hbs b/assets/javascripts/app/templates/repositories/show.hbs index 44fdfb19..98cd937c 100644 --- a/assets/javascripts/app/templates/repositories/show.hbs +++ b/assets/javascripts/app/templates/repositories/show.hbs @@ -1,6 +1,6 @@ -{{#if view.repository.isLoaded}} - {{#with view.repository}} -
+
+ {{#if view.repository.isLoaded}} + {{#with view.repository}}

{{slug}}

@@ -14,15 +14,13 @@ {{view Travis.TabsView}} -
- -
- {{outlet pane}} -
- {{/with}} -{{else}} -
+ {{/with}} + {{else}} Loading -
-{{/if}} + {{/if}} + +
+ {{outlet pane}} +
+
diff --git a/assets/javascripts/app/templates/workers/list.hbs b/assets/javascripts/app/templates/workers/list.hbs index 1792c9ca..c901d172 100644 --- a/assets/javascripts/app/templates/workers/list.hbs +++ b/assets/javascripts/app/templates/workers/list.hbs @@ -1,5 +1,5 @@

{{t workers}}

-