diff --git a/static/js/app/views/sidebar/sidebarView.coffee b/static/js/app/views/sidebar/sidebarView.coffee index fc7bf0b..de50a81 100755 --- a/static/js/app/views/sidebar/sidebarView.coffee +++ b/static/js/app/views/sidebar/sidebarView.coffee @@ -24,14 +24,6 @@ define ['underscore', 'backbone', 'marionette', 'vent', 'views/activity/activity console.log "SidebarView: onShow" @streamRegion.show(new ActivityListView()) $(@topRegion.el).hide() - """ - @topRegion.show( - new NowPlayingView( - model: new Backbone.Model({ - item_url: "fdskjfhdsk", title: "Argle bargle", user_profile_url: "/", user_name: "Foo Ferra" - }) - )) - """ return mixInit: (model) -> diff --git a/static/js/app/views/sidebar/sidebarView.js b/static/js/app/views/sidebar/sidebarView.js index f5ddc3d..8c60fea 100755 --- a/static/js/app/views/sidebar/sidebarView.js +++ b/static/js/app/views/sidebar/sidebarView.js @@ -1,16 +1,17 @@ -// Generated by CoffeeScript 1.3.3 +// Generated by CoffeeScript 1.6.2 (function() { var __hasProp = {}.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; define(['underscore', 'backbone', 'marionette', 'vent', 'views/activity/activityListView', 'views/widgets/nowPlayingView', 'text!/tpl/SidebarView'], function(_, Backbone, Marionette, vent, ActivityListView, NowPlayingView, Template) { - var SidebarView; - SidebarView = (function(_super) { + var SidebarView, _ref; + SidebarView = (function(_super) { __extends(SidebarView, _super); function SidebarView() { - return SidebarView.__super__.constructor.apply(this, arguments); + _ref = SidebarView.__super__.constructor.apply(this, arguments); + return _ref; } SidebarView.prototype.template = _.template(Template); @@ -36,8 +37,6 @@ console.log("SidebarView: onShow"); this.streamRegion.show(new ActivityListView()); $(this.topRegion.el).hide(); - "@topRegion.show(\n new NowPlayingView(\n model: new Backbone.Model({\n item_url: \"fdskjfhdsk\", title: \"Argle bargle\", user_profile_url: \"/\", user_name: \"Foo Ferra\"\n })\n ))"; - }; SidebarView.prototype.mixInit = function(model) { @@ -50,6 +49,7 @@ SidebarView.prototype.liveStarted = function() { var _this = this; + console.log("SidebarView: livePlay"); $.getJSON("ajax/live_now_playing/", function(data) { $(_this.topRegion.el).show(); diff --git a/templates/views/ActivityListItemView.html b/templates/views/ActivityListItemView.html index 51e0c25..fa2e86e 100755 --- a/templates/views/ActivityListItemView.html +++ b/templates/views/ActivityListItemView.html @@ -6,7 +6,7 @@