From 11988099791a81250c8eb1ccd0cf31a828c714a2 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Mon, 8 Apr 2013 00:36:19 +0200 Subject: [PATCH] Move WorkersView and JobsView to Travis.SidebarView namespace Travis.JobsView already exists, so I need to put those views in some other namespace, but so that they're available without instantiating SidebarView --- assets/scripts/app/views/sidebar.coffee | 36 +++++++++++++------------ 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/assets/scripts/app/views/sidebar.coffee b/assets/scripts/app/views/sidebar.coffee index fd8d28b4..0c345fa1 100644 --- a/assets/scripts/app/views/sidebar.coffee +++ b/assets/scripts/app/views/sidebar.coffee @@ -1,20 +1,4 @@ @Travis.reopen - WorkersView: Em.View.extend - templateName: 'workers/list' - init: -> - @_super.apply this, arguments - @set 'controller', @get('controller').container.lookup('controller:workers') - - JobsView: Em.View.extend - templateName: 'jobs/running' - elementId: 'running-jobs' - init: -> - @_super.apply this, arguments - @set 'controller', @get('controller').container.lookup('controller:runningJobs') - - groupsBinding: 'controller.sortedGroups' - jobsBinding: 'controller' - SidebarView: Travis.View.extend templateName: 'layouts/sidebar' @@ -24,9 +8,10 @@ @activate('jobs') activate: (name) -> + console.log return if @get('activeTab') == name @set('activeTab', name) - @connectOutlet 'pane', Travis["#{name.capitalize()}View"].create(controller: @get('controller')) + @connectOutlet 'pane', Travis.SidebarView["#{name.capitalize()}View"].create(controller: @get('controller')) classQueues: (-> 'active' if @get('activeTab') == 'queues' @@ -96,3 +81,20 @@ QueueItemView: Travis.View.extend tagName: 'li' + +Travis.SidebarView.reopenClass + WorkersView: Em.View.extend + templateName: 'workers/list' + init: -> + @_super.apply this, arguments + @set 'controller', @get('controller').container.lookup('controller:workers') + + JobsView: Em.View.extend + templateName: 'jobs/running' + elementId: 'running-jobs' + init: -> + @_super.apply this, arguments + @set 'controller', @get('controller').container.lookup('controller:runningJobs') + + groupsBinding: 'controller.sortedGroups' + jobsBinding: 'controller'