diff --git a/static/js/app/appv2.coffee b/static/js/app/appv2.coffee index 1941cdf..6ae2227 100755 --- a/static/js/app/appv2.coffee +++ b/static/js/app/appv2.coffee @@ -62,7 +62,7 @@ define ['backbone', 'marionette', 'vent', true App.headerRegion.show(new HeaderView()); - #sidebarView = new SidebarView(); - #App.sidebarRegion.show(sidebarView) + sidebarView = new SidebarView(); + App.sidebarRegion.show(sidebarView) return App; diff --git a/static/js/app/appv2.js b/static/js/app/appv2.js index f525550..fe5f41e 100755 --- a/static/js/app/appv2.js +++ b/static/js/app/appv2.js @@ -2,7 +2,7 @@ (function() { define(['backbone', 'marionette', 'vent', 'app.lib/router', 'app.lib/panningRegion', 'app.lib/realtimeController', 'app.lib/audioController', 'views/widgets/headerView', 'views/sidebar/sidebarView', 'models/mix/mixCollection'], function(Backbone, Marionette, vent, DssRouter, PanningRegion, RealtimeController, AudioController, HeaderView, SidebarView, MixCollection) { - var App; + var App, sidebarView; App = new Marionette.Application(); App.audioController = new AudioController(); App.realtimeController = new RealtimeController(); @@ -73,6 +73,8 @@ }); }); App.headerRegion.show(new HeaderView()); + sidebarView = new SidebarView(); + App.sidebarRegion.show(sidebarView); return App; });