diff --git a/static/js/app/lib/controller.coffee b/static/js/app/lib/controller.coffee index 82a632e..a038e75 100755 --- a/static/js/app/lib/controller.coffee +++ b/static/js/app/lib/controller.coffee @@ -4,7 +4,6 @@ define ['app', 'marionette', 'vent', 'utils' 'models/mix/mixItem', 'models/mix/mixCollection', 'models/user/userItem'], (App, Marionette, vent, utils, MixListLayout, MixListView, MixDetailView, - StreamListLayout, MixEditView, UserProfileView, UserListView, UserEditView, MixItem, MixCollection, UserItem)-> class DssController extends Marionette.Controller diff --git a/static/js/app/lib/controller.js b/static/js/app/lib/controller.js index f8cdb84..4426639 100755 --- a/static/js/app/lib/controller.js +++ b/static/js/app/lib/controller.js @@ -3,7 +3,7 @@ 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(['app', 'marionette', 'vent', 'utils', 'views/mix/mixListLayout', 'views/mix/mixListView', 'views/mix/mixDetailView', 'views/mix/mixEditView', 'views/user/userProfileView', 'views/user/userListView', 'views/user/userEditView', 'models/mix/mixItem', 'models/mix/mixCollection', 'models/user/userItem'], function(App, Marionette, vent, utils, MixListLayout, MixListView, MixDetailView, StreamListLayout, MixEditView, UserProfileView, UserListView, UserEditView, MixItem, MixCollection, UserItem) { + define(['app', 'marionette', 'vent', 'utils', 'views/mix/mixListLayout', 'views/mix/mixListView', 'views/mix/mixDetailView', 'views/mix/mixEditView', 'views/user/userProfileView', 'views/user/userListView', 'views/user/userEditView', 'models/mix/mixItem', 'models/mix/mixCollection', 'models/user/userItem'], function(App, Marionette, vent, utils, MixListLayout, MixListView, MixDetailView, MixEditView, UserProfileView, UserListView, UserEditView, MixItem, MixCollection, UserItem) { var DssController; DssController = (function(_super) { diff --git a/static/js/app/lib/dssView.js b/static/js/app/lib/dssView.js index 941f18d..4d6fc6f 100644 --- a/static/js/app/lib/dssView.js +++ b/static/js/app/lib/dssView.js @@ -1,17 +1,16 @@ -// Generated by CoffeeScript 1.6.2 +// Generated by CoffeeScript 1.4.0 (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(['marionette', 'utils'], function(Marionette, utils) { - var DssView, _ref; - + var DssView; DssView = (function(_super) { + __extends(DssView, _super); function DssView() { - _ref = DssView.__super__.constructor.apply(this, arguments); - return _ref; + return DssView.__super__.constructor.apply(this, arguments); } DssView.prototype.templateHelpers = { diff --git a/static/js/app/views/user/userItemView.coffee b/static/js/app/views/user/userItemView.coffee index 08fca2c..a37649f 100755 --- a/static/js/app/views/user/userItemView.coffee +++ b/static/js/app/views/user/userItemView.coffee @@ -11,5 +11,4 @@ define ['app', 'moment', 'app.lib/dssView', 'vent', 'text!/tpl/UserListItemView' initialize: => @listenTo(@model, 'change:is_following', @render) - UserItemView diff --git a/static/js/app/views/user/userItemView.js b/static/js/app/views/user/userItemView.js index dc7e3f8..cf0e4c8 100755 --- a/static/js/app/views/user/userItemView.js +++ b/static/js/app/views/user/userItemView.js @@ -1,18 +1,18 @@ -// Generated by CoffeeScript 1.6.2 +// Generated by CoffeeScript 1.4.0 (function() { var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, __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(['app', 'moment', 'app.lib/dssView', 'vent', 'text!/tpl/UserListItemView'], function(App, moment, DssView, vent, Template) { - var UserItemView, _ref; - + var UserItemView; UserItemView = (function(_super) { + __extends(UserItemView, _super); function UserItemView() { - this.initialize = __bind(this.initialize, this); _ref = UserItemView.__super__.constructor.apply(this, arguments); - return _ref; + this.initialize = __bind(this.initialize, this); + return UserItemView.__super__.constructor.apply(this, arguments); } UserItemView.prototype.template = _.template(Template); diff --git a/templates/views/UserListItemView.html b/templates/views/UserListItemView.html index 17155cc..24b31b6 100755 --- a/templates/views/UserListItemView.html +++ b/templates/views/UserListItemView.html @@ -39,8 +39,6 @@
- - <% if (isMe(id)) { %>