diff --git a/static/js/app/appv2.coffee b/static/js/app/appv2.coffee index 3f6bc50..c6f03ed 100644 --- a/static/js/app/appv2.coffee +++ b/static/js/app/appv2.coffee @@ -1,5 +1,5 @@ -define ['backbone', 'marionette', 'app.lib/router', 'app.lib/panningRegion', 'views/header', 'views/sidebar/sidebar', - 'models/mix/collection'], +define ['backbone', 'marionette', 'app.lib/router', 'app.lib/panningRegion', 'views/header', 'views/sidebar/sidebarView', + 'models/mix/mixCollection'], (Backbone, Marionette, DssRouter, PanningRegion, HeaderView, SidebarView, MixCollection) -> Marionette.Region.prototype.open = (view) -> @.$el.hide(); diff --git a/static/js/app/appv2.js b/static/js/app/appv2.js index d235522..964c18c 100644 --- a/static/js/app/appv2.js +++ b/static/js/app/appv2.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript 1.3.3 (function() { - define(['backbone', 'marionette', 'app.lib/router', 'app.lib/panningRegion', 'views/header', 'views/sidebar/sidebar', 'models/mix/collection'], function(Backbone, Marionette, DssRouter, PanningRegion, HeaderView, SidebarView, MixCollection) { + define(['backbone', 'marionette', 'app.lib/router', 'app.lib/panningRegion', 'views/header', 'views/sidebar/sidebarView', 'models/mix/mixCollection'], function(Backbone, Marionette, DssRouter, PanningRegion, HeaderView, SidebarView, MixCollection) { var App, sidebarView; Marionette.Region.prototype.open = function(view) { this.$el.hide(); diff --git a/static/js/app/lib/controller.coffee b/static/js/app/lib/controller.coffee index 5e1810c..0f0cef5 100644 --- a/static/js/app/lib/controller.coffee +++ b/static/js/app/lib/controller.coffee @@ -1,6 +1,6 @@ define ['app', 'marionette', - 'models/mix/item', 'views/mix/list', 'views/mix/detail', 'views/mix/edit', - 'models/user/item', 'views/user/userEditView'], + 'models/mix/mixItem', 'views/mix/mixListView', 'views/mix/mixDetailView', 'views/mix/mixEditView', + 'models/user/userItem', 'views/user/userEditView'], (App, Marionette, MixItem, MixListView, MixDetailView, MixEditView, UserItem, UserEditView)-> class DssController extends Marionette.Controller home: -> @@ -27,6 +27,18 @@ define ['app', 'marionette', ) true + uploadMix: -> + console.log("Controller: mixUpload") + app = require('app') + mix = new MixItem({ + title: '', + description: '', + mix_image: '', + is_featured: false + }); + app.contentRegion.show(new MixEditView({model: mix})) + true + editMix: (slug) -> console.log("Controller: mixEdit") app = require('app') diff --git a/static/js/app/lib/controller.js b/static/js/app/lib/controller.js index 748b516..f7f5468 100644 --- 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', 'models/mix/item', 'views/mix/list', 'views/mix/detail', 'views/mix/edit', 'models/user/item', 'views/user/userEditView'], function(App, Marionette, MixItem, MixListView, MixDetailView, MixEditView, UserItem, UserEditView) { + define(['app', 'marionette', 'models/mix/mixItem', 'views/mix/mixListView', 'views/mix/mixDetailView', 'views/mix/mixEditView', 'models/user/userItem', 'views/user/userEditView'], function(App, Marionette, MixItem, MixListView, MixDetailView, MixEditView, UserItem, UserEditView) { var DssController; DssController = (function(_super) { @@ -48,6 +48,22 @@ return true; }; + DssController.prototype.uploadMix = function() { + var app, mix; + console.log("Controller: mixUpload"); + app = require('app'); + mix = new MixItem({ + title: '', + description: '', + mix_image: '', + is_featured: false + }); + app.contentRegion.show(new MixEditView({ + model: mix + })); + return true; + }; + DssController.prototype.editMix = function(slug) { var app, mix; console.log("Controller: mixEdit"); diff --git a/static/js/app/lib/router.coffee b/static/js/app/lib/router.coffee index a8f560a..46663d5 100644 --- a/static/js/app/lib/router.coffee +++ b/static/js/app/lib/router.coffee @@ -6,6 +6,7 @@ define ['marionette', 'app.lib/controller'], "": "home", "/": "home", + "mix/upload": "uploadMix", "mixes": "showMixList", "mixes/:type": "showMixList" "mix/:slug": "showMix" diff --git a/static/js/app/lib/router.js b/static/js/app/lib/router.js index 6f12e08..5f5b4c2 100644 --- a/static/js/app/lib/router.js +++ b/static/js/app/lib/router.js @@ -18,6 +18,7 @@ DssRouter.prototype.appRoutes = { "": "home", "/": "home", + "mix/upload": "uploadMix", "mixes": "showMixList", "mixes/:type": "showMixList", "mix/:slug": "showMix", diff --git a/static/js/app/models/activity/collection.coffee b/static/js/app/models/activity/activityCollection.coffee similarity index 69% rename from static/js/app/models/activity/collection.coffee rename to static/js/app/models/activity/activityCollection.coffee index 9597421..8e05c14 100644 --- a/static/js/app/models/activity/collection.coffee +++ b/static/js/app/models/activity/activityCollection.coffee @@ -1,4 +1,4 @@ -define ['backbone', 'models/activity/item', 'app.lib/backbone.dss.model.collection'], \ +define ['backbone', 'models/activity/activityItem', 'app.lib/backbone.dss.model.collection'], \ (Backbone, ActivityItem, DssCollection) -> class ActivityCollection extends DssCollection model: ActivityItem diff --git a/static/js/app/models/activity/collection.js b/static/js/app/models/activity/activityCollection.js similarity index 72% rename from static/js/app/models/activity/collection.js rename to static/js/app/models/activity/activityCollection.js index 7b83f67..baff58a 100644 --- a/static/js/app/models/activity/collection.js +++ b/static/js/app/models/activity/activityCollection.js @@ -1,17 +1,16 @@ -// Generated by CoffeeScript 1.6.2 +// Generated by CoffeeScript 1.3.3 (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(['backbone', 'models/activity/item', 'app.lib/backbone.dss.model.collection'], function(Backbone, ActivityItem, DssCollection) { - var ActivityCollection, _ref; - + define(['backbone', 'models/activity/activityItem', 'app.lib/backbone.dss.model.collection'], function(Backbone, ActivityItem, DssCollection) { + var ActivityCollection; ActivityCollection = (function(_super) { + __extends(ActivityCollection, _super); function ActivityCollection() { - _ref = ActivityCollection.__super__.constructor.apply(this, arguments); - return _ref; + return ActivityCollection.__super__.constructor.apply(this, arguments); } ActivityCollection.prototype.model = ActivityItem; diff --git a/static/js/app/models/activity/item.coffee b/static/js/app/models/activity/activityItem.coffee similarity index 100% rename from static/js/app/models/activity/item.coffee rename to static/js/app/models/activity/activityItem.coffee diff --git a/static/js/app/models/activity/item.js b/static/js/app/models/activity/activityItem.js similarity index 82% rename from static/js/app/models/activity/item.js rename to static/js/app/models/activity/activityItem.js index e95d107..7e9f57d 100644 --- a/static/js/app/models/activity/item.js +++ b/static/js/app/models/activity/activityItem.js @@ -1,17 +1,16 @@ -// Generated by CoffeeScript 1.6.2 +// Generated by CoffeeScript 1.3.3 (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(['backbone'], function(Backbone) { - var ActivityItem, _ref; - + var ActivityItem; return ActivityItem = (function(_super) { + __extends(ActivityItem, _super); function ActivityItem() { - _ref = ActivityItem.__super__.constructor.apply(this, arguments); - return _ref; + return ActivityItem.__super__.constructor.apply(this, arguments); } ActivityItem.prototype.urlRoot = com.podnoms.settings.urlRoot + "activity/"; diff --git a/static/js/app/models/comments/collection.coffee b/static/js/app/models/comment/commentCollection.coffee similarity index 60% rename from static/js/app/models/comments/collection.coffee rename to static/js/app/models/comment/commentCollection.coffee index 989a038..455050b 100644 --- a/static/js/app/models/comments/collection.coffee +++ b/static/js/app/models/comment/commentCollection.coffee @@ -1,4 +1,4 @@ -define ['backbone', 'models/comments/item', 'app.lib/backbone.dss.model.collection'], +define ['backbone', 'models/comment/commentItem', 'app.lib/backbone.dss.model.collection'], (Backbone, CommentItem, DssCollection) -> class CommentCollection extends DssCollection model: CommentItem diff --git a/static/js/app/models/comments/collection.js b/static/js/app/models/comment/commentCollection.js similarity index 84% rename from static/js/app/models/comments/collection.js rename to static/js/app/models/comment/commentCollection.js index 4df79c6..be62a52 100644 --- a/static/js/app/models/comments/collection.js +++ b/static/js/app/models/comment/commentCollection.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(['backbone', 'models/comments/item', 'app.lib/backbone.dss.model.collection'], function(Backbone, CommentItem, DssCollection) { + define(['backbone', 'models/comment/commentItem', 'app.lib/backbone.dss.model.collection'], function(Backbone, CommentItem, DssCollection) { var CommentCollection; CommentCollection = (function(_super) { diff --git a/static/js/app/models/comments/item.coffee b/static/js/app/models/comment/commentItem.coffee similarity index 100% rename from static/js/app/models/comments/item.coffee rename to static/js/app/models/comment/commentItem.coffee diff --git a/static/js/app/models/comments/item.js b/static/js/app/models/comment/commentItem.js similarity index 100% rename from static/js/app/models/comments/item.js rename to static/js/app/models/comment/commentItem.js diff --git a/static/js/app/models/mix/item.coffee b/static/js/app/models/mix/item.coffee deleted file mode 100644 index a0be580..0000000 --- a/static/js/app/models/mix/item.coffee +++ /dev/null @@ -1,6 +0,0 @@ -define ['app.lib/backbone.dss.model'], \ - (DssModel) -> - class MixItem extends DssModel - urlRoot: com.podnoms.settings.urlRoot + "mix/" - - MixItem \ No newline at end of file diff --git a/static/js/app/models/mix/collection.coffee b/static/js/app/models/mix/mixCollection.coffee similarity index 76% rename from static/js/app/models/mix/collection.coffee rename to static/js/app/models/mix/mixCollection.coffee index 8edd2f1..80495ac 100644 --- a/static/js/app/models/mix/collection.coffee +++ b/static/js/app/models/mix/mixCollection.coffee @@ -1,4 +1,4 @@ -define ['backbone', 'models/mix/item', 'app.lib/backbone.dss.model.collection'], \ +define ['backbone', 'models/mix/mixItem', 'app.lib/backbone.dss.model.collection'], \ (Backbone, MixItem, DssCollection) -> class MixCollection extends DssCollection model: MixItem diff --git a/static/js/app/models/mix/collection.js b/static/js/app/models/mix/mixCollection.js similarity index 87% rename from static/js/app/models/mix/collection.js rename to static/js/app/models/mix/mixCollection.js index e9c90f0..68d2ad3 100644 --- a/static/js/app/models/mix/collection.js +++ b/static/js/app/models/mix/mixCollection.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(['backbone', 'models/mix/item', 'app.lib/backbone.dss.model.collection'], function(Backbone, MixItem, DssCollection) { + define(['backbone', 'models/mix/mixItem', 'app.lib/backbone.dss.model.collection'], function(Backbone, MixItem, DssCollection) { var MixCollection; MixCollection = (function(_super) { diff --git a/static/js/app/models/mix/mixItem.coffee b/static/js/app/models/mix/mixItem.coffee new file mode 100644 index 0000000..fd1e769 --- /dev/null +++ b/static/js/app/models/mix/mixItem.coffee @@ -0,0 +1,6 @@ +define ['backbone', 'app.lib/backbone.dss.model'], \ + (Backbone, DssModel) -> + class MixItem extends Backbone.Model + urlRoot: com.podnoms.settings.urlRoot + "mix/" + + MixItem \ No newline at end of file diff --git a/static/js/app/models/mix/item.js b/static/js/app/models/mix/mixItem.js similarity index 86% rename from static/js/app/models/mix/item.js rename to static/js/app/models/mix/mixItem.js index 73e945a..34bb647 100644 --- a/static/js/app/models/mix/item.js +++ b/static/js/app/models/mix/mixItem.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.lib/backbone.dss.model'], function(DssModel) { + define(['backbone', 'app.lib/backbone.dss.model'], function(Backbone, DssModel) { var MixItem; MixItem = (function(_super) { @@ -17,7 +17,7 @@ return MixItem; - })(DssModel); + })(Backbone.Model); return MixItem; }); diff --git a/static/js/app/models/user/collection.coffee b/static/js/app/models/user/userCollection.coffee similarity index 69% rename from static/js/app/models/user/collection.coffee rename to static/js/app/models/user/userCollection.coffee index 1713df2..5dc61e5 100644 --- a/static/js/app/models/user/collection.coffee +++ b/static/js/app/models/user/userCollection.coffee @@ -1,4 +1,4 @@ -define ['backbone', 'models/user/item', 'app.lib/backbone.dss.model.collection'], \ +define ['backbone', 'models/user/userItem', 'app.lib/backbone.dss.model.collection'], \ (Backbone, UserItem, DssCollection) -> class UserCollection extends DssCollection model: UserItem diff --git a/static/js/app/models/user/collection.js b/static/js/app/models/user/userCollection.js similarity index 86% rename from static/js/app/models/user/collection.js rename to static/js/app/models/user/userCollection.js index 5e2f93a..9db6a7e 100644 --- a/static/js/app/models/user/collection.js +++ b/static/js/app/models/user/userCollection.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(['backbone', 'models/user/item', 'app.lib/backbone.dss.model.collection'], function(Backbone, UserItem, DssCollection) { + define(['backbone', 'models/user/userItem', 'app.lib/backbone.dss.model.collection'], function(Backbone, UserItem, DssCollection) { var UserCollection; UserCollection = (function(_super) { diff --git a/static/js/app/models/user/item.coffee b/static/js/app/models/user/userItem.coffee similarity index 100% rename from static/js/app/models/user/item.coffee rename to static/js/app/models/user/userItem.coffee diff --git a/static/js/app/models/user/item.js b/static/js/app/models/user/userItem.js similarity index 100% rename from static/js/app/models/user/item.js rename to static/js/app/models/user/userItem.js diff --git a/static/js/app/views/activity/item.coffee b/static/js/app/views/activity/activityItemView.coffee similarity index 100% rename from static/js/app/views/activity/item.coffee rename to static/js/app/views/activity/activityItemView.coffee diff --git a/static/js/app/views/activity/item.js b/static/js/app/views/activity/activityItemView.js similarity index 100% rename from static/js/app/views/activity/item.js rename to static/js/app/views/activity/activityItemView.js diff --git a/static/js/app/views/activity/list.coffee b/static/js/app/views/activity/activityListView.coffee similarity index 84% rename from static/js/app/views/activity/list.coffee rename to static/js/app/views/activity/activityListView.coffee index d897a32..31b1ea8 100644 --- a/static/js/app/views/activity/list.coffee +++ b/static/js/app/views/activity/activityListView.coffee @@ -1,4 +1,4 @@ -define ['marionette', 'models/activity/collection', 'views/activity/item', 'text!/tpl/ActivityListView'], +define ['marionette', 'models/activity/activityCollection', 'views/activity/activityItemView', 'text!/tpl/ActivityListView'], (Marionette, ActivityCollection, ActivityItemView, Template) -> class ActivityListView extends Marionette.CompositeView diff --git a/static/js/app/views/activity/list.js b/static/js/app/views/activity/activityListView.js similarity index 87% rename from static/js/app/views/activity/list.js rename to static/js/app/views/activity/activityListView.js index 5e0f473..9b79122 100644 --- a/static/js/app/views/activity/list.js +++ b/static/js/app/views/activity/activityListView.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(['marionette', 'models/activity/collection', 'views/activity/item', 'text!/tpl/ActivityListView'], function(Marionette, ActivityCollection, ActivityItemView, Template) { + define(['marionette', 'models/activity/activityCollection', 'views/activity/activityItemView', 'text!/tpl/ActivityListView'], function(Marionette, ActivityCollection, ActivityItemView, Template) { var ActivityListView; ActivityListView = (function(_super) { diff --git a/static/js/app/views/comments/item.coffee b/static/js/app/views/comment/commentItemView.coffee similarity index 100% rename from static/js/app/views/comments/item.coffee rename to static/js/app/views/comment/commentItemView.coffee diff --git a/static/js/app/views/comments/item.js b/static/js/app/views/comment/commentItemView.js similarity index 100% rename from static/js/app/views/comments/item.js rename to static/js/app/views/comment/commentItemView.js diff --git a/static/js/app/views/comments/list.coffee b/static/js/app/views/comment/commentListView.coffee similarity index 82% rename from static/js/app/views/comments/list.coffee rename to static/js/app/views/comment/commentListView.coffee index a08f2cd..154ab99 100644 --- a/static/js/app/views/comments/list.coffee +++ b/static/js/app/views/comment/commentListView.coffee @@ -1,4 +1,4 @@ -define ['marionette', 'views/comments/item', 'text!/tpl/CommentListView'], +define ['marionette', 'views/comment/commentItemView', 'text!/tpl/CommentListView'], (Marionette, CommentItemView, Template) -> class CommentListView extends Marionette.CompositeView diff --git a/static/js/app/views/comments/list.js b/static/js/app/views/comment/commentListView.js similarity index 89% rename from static/js/app/views/comments/list.js rename to static/js/app/views/comment/commentListView.js index 84b9414..3ce168d 100644 --- a/static/js/app/views/comments/list.js +++ b/static/js/app/views/comment/commentListView.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(['marionette', 'views/comments/item', 'text!/tpl/CommentListView'], function(Marionette, CommentItemView, Template) { + define(['marionette', 'views/comment/commentItemView', 'text!/tpl/CommentListView'], function(Marionette, CommentItemView, Template) { var CommentListView; CommentListView = (function(_super) { diff --git a/static/js/app/views/mix/detail.coffee b/static/js/app/views/mix/mixDetailView.coffee similarity index 80% rename from static/js/app/views/mix/detail.coffee rename to static/js/app/views/mix/mixDetailView.coffee index 74d0b61..ee4bc9c 100644 --- a/static/js/app/views/mix/detail.coffee +++ b/static/js/app/views/mix/mixDetailView.coffee @@ -1,4 +1,4 @@ -define ['marionette', 'models/mix/item', 'views/mix/item', 'text!/tpl/MixDetailView'], +define ['marionette', 'models/mix/mixItem', 'views/mix/mixItemView', 'text!/tpl/MixDetailView'], (Marionette, MixItem, MixItemView, Template) -> class MixDetailView extends Marionette.Layout diff --git a/static/js/app/views/mix/detail.js b/static/js/app/views/mix/mixDetailView.js similarity index 88% rename from static/js/app/views/mix/detail.js rename to static/js/app/views/mix/mixDetailView.js index d9003aa..ea3c7f2 100644 --- a/static/js/app/views/mix/detail.js +++ b/static/js/app/views/mix/mixDetailView.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(['marionette', 'models/mix/item', 'views/mix/item', 'text!/tpl/MixDetailView'], function(Marionette, MixItem, MixItemView, Template) { + define(['marionette', 'models/mix/mixItem', 'views/mix/mixItemView', 'text!/tpl/MixDetailView'], function(Marionette, MixItem, MixItemView, Template) { var MixDetailView; MixDetailView = (function(_super) { diff --git a/static/js/app/views/mix/edit.coffee b/static/js/app/views/mix/mixEditView.coffee similarity index 99% rename from static/js/app/views/mix/edit.coffee rename to static/js/app/views/mix/mixEditView.coffee index ef64674..57ab1e1 100644 --- a/static/js/app/views/mix/edit.coffee +++ b/static/js/app/views/mix/mixEditView.coffee @@ -19,7 +19,7 @@ define ['app.lib/editableView', 'moment', 'libs/backbone/backbone.syphon', 'text console.log("MixEditView: onRender") @sendImage = false parent = this - if @model.id is 'undefined' + if not @model.id $("#mix-upload", @el).uploadifive( uploadScript: "/ajax/upload_mix_file_handler/" buttonText: "Select audio file (mp3 for now please)" diff --git a/static/js/app/views/mix/edit.js b/static/js/app/views/mix/mixEditView.js similarity index 99% rename from static/js/app/views/mix/edit.js rename to static/js/app/views/mix/mixEditView.js index 281b436..9b09598 100644 --- a/static/js/app/views/mix/edit.js +++ b/static/js/app/views/mix/mixEditView.js @@ -40,7 +40,7 @@ console.log("MixEditView: onRender"); this.sendImage = false; parent = this; - if (this.model.id === 'undefined') { + if (!this.model.id) { $("#mix-upload", this.el).uploadifive({ uploadScript: "/ajax/upload_mix_file_handler/", buttonText: "Select audio file (mp3 for now please)", diff --git a/static/js/app/views/mix/item.coffee b/static/js/app/views/mix/mixItemView.coffee similarity index 96% rename from static/js/app/views/mix/item.coffee rename to static/js/app/views/mix/mixItemView.coffee index 619a8b1..e877046 100644 --- a/static/js/app/views/mix/item.coffee +++ b/static/js/app/views/mix/mixItemView.coffee @@ -1,4 +1,4 @@ -define ['moment', 'app', 'marionette', 'models/comments/collection', 'views/comments/list', 'text!/tpl/MixListItemView'], +define ['moment', 'app', 'marionette', 'models/comment/commentCollection', 'views/comment/commentListView', 'text!/tpl/MixListItemView'], (moment, App, Marionette, CommentsCollection, CommentsListView, Template) -> class MixItemView extends Marionette.ItemView template: _.template(Template) diff --git a/static/js/app/views/mix/item.js b/static/js/app/views/mix/mixItemView.js similarity index 96% rename from static/js/app/views/mix/item.js rename to static/js/app/views/mix/mixItemView.js index a711214..c7da18c 100644 --- a/static/js/app/views/mix/item.js +++ b/static/js/app/views/mix/mixItemView.js @@ -4,7 +4,7 @@ __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(['moment', 'app', 'marionette', 'models/comments/collection', 'views/comments/list', 'text!/tpl/MixListItemView'], function(moment, App, Marionette, CommentsCollection, CommentsListView, Template) { + define(['moment', 'app', 'marionette', 'models/comment/commentCollection', 'views/comment/commentListView', 'text!/tpl/MixListItemView'], function(moment, App, Marionette, CommentsCollection, CommentsListView, Template) { var MixItemView; MixItemView = (function(_super) { diff --git a/static/js/app/views/mix/list.coffee b/static/js/app/views/mix/mixListView.coffee similarity index 87% rename from static/js/app/views/mix/list.coffee rename to static/js/app/views/mix/mixListView.coffee index e6b134e..938ef45 100644 --- a/static/js/app/views/mix/list.coffee +++ b/static/js/app/views/mix/mixListView.coffee @@ -1,4 +1,4 @@ -define ['marionette', 'models/mix/collection', 'views/mix/item', 'text!/tpl/MixListView'], +define ['marionette', 'models/mix/mixCollection', 'views/mix/mixItemView', 'text!/tpl/MixListView'], (Marionette, MixCollection, MixItemView, Template) -> class MixListView extends Marionette.CompositeView diff --git a/static/js/app/views/mix/list.js b/static/js/app/views/mix/mixListView.js similarity index 89% rename from static/js/app/views/mix/list.js rename to static/js/app/views/mix/mixListView.js index 56e893d..2b2aa17 100644 --- a/static/js/app/views/mix/list.js +++ b/static/js/app/views/mix/mixListView.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(['marionette', 'models/mix/collection', 'views/mix/item', 'text!/tpl/MixListView'], function(Marionette, MixCollection, MixItemView, Template) { + define(['marionette', 'models/mix/mixCollection', 'views/mix/mixItemView', 'text!/tpl/MixListView'], function(Marionette, MixCollection, MixItemView, Template) { var MixListView; MixListView = (function(_super) { diff --git a/static/js/app/views/sidebar/sidebar.coffee b/static/js/app/views/sidebar/sidebarView.coffee similarity index 93% rename from static/js/app/views/sidebar/sidebar.coffee rename to static/js/app/views/sidebar/sidebarView.coffee index c45cb57..ff89965 100644 --- a/static/js/app/views/sidebar/sidebar.coffee +++ b/static/js/app/views/sidebar/sidebarView.coffee @@ -1,4 +1,4 @@ -define ['underscore', 'backbone', 'marionette', 'views/activity/list', 'text!/tpl/SidebarView'], +define ['underscore', 'backbone', 'marionette', 'views/activity/activityListView', 'text!/tpl/SidebarView'], (_, Backbone, Marionette, ActivityListView, Template) -> class SidebarView extends Marionette.Layout template: _.template(Template) diff --git a/static/js/app/views/sidebar/sidebar.js b/static/js/app/views/sidebar/sidebarView.js similarity index 91% rename from static/js/app/views/sidebar/sidebar.js rename to static/js/app/views/sidebar/sidebarView.js index 7a3a915..f43bad5 100644 --- a/static/js/app/views/sidebar/sidebar.js +++ b/static/js/app/views/sidebar/sidebarView.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(['underscore', 'backbone', 'marionette', 'views/activity/list', 'text!/tpl/SidebarView'], function(_, Backbone, Marionette, ActivityListView, Template) { + define(['underscore', 'backbone', 'marionette', 'views/activity/activityListView', 'text!/tpl/SidebarView'], function(_, Backbone, Marionette, ActivityListView, Template) { var SidebarView; return SidebarView = (function(_super) { diff --git a/static/js/app/views/user/userItem.coffee b/static/js/app/views/user/userItemView.coffee similarity index 99% rename from static/js/app/views/user/userItem.coffee rename to static/js/app/views/user/userItemView.coffee index 976cf4e..39295e4 100644 --- a/static/js/app/views/user/userItem.coffee +++ b/static/js/app/views/user/userItemView.coffee @@ -2,3 +2,4 @@ define ['app', 'marionette'], (App, Marionette)-> class UserItemView extends Marionette.ItemView itemView: UserItemView + \ No newline at end of file diff --git a/static/js/app/views/user/userItem.js b/static/js/app/views/user/userItemView.js similarity index 100% rename from static/js/app/views/user/userItem.js rename to static/js/app/views/user/userItemView.js diff --git a/static/js/app/views/user/userList.js b/static/js/app/views/user/userList.js deleted file mode 100644 index 4b47e8f..0000000 --- a/static/js/app/views/user/userList.js +++ /dev/null @@ -1,33 +0,0 @@ -// 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(['views/user/userItem'], function(UserItemView) { - var UserListView, _ref; - - return UserListView = (function(_super) { - __extends(UserListView, _super); - - function UserListView() { - _ref = UserListView.__super__.constructor.apply(this, arguments); - return _ref; - } - - return UserListView; - - })(Marionette.CompositeView(function() { - ({ - template: "

Hello Sailor + + @@ -67,12 +69,10 @@ {% endcompress %} {% comment %} - -