fergalmoran/dss
1
0
Fork 0
mirror of https://github.com/fergalmoran/dss.git synced 2025-12-25 19:17:35 +00:00
Code Issues 13 Packages Projects Releases Wiki Activity

Stashing changes pre media element branch

Browse Source
This commit is contained in:
Fergal Moran
2014-05-12 19:32:43 +01:00
parent 73cf378d82
commit 25ccc29d87
28 changed files with 754 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
static/js/app/lib/controller.js
View File

@@ -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/schedule/scheduleView', 'views/mix/mixEditView', 'views/user/userProfileView', 'views/user/userListView', 'views/user/userEditView', 'models/mix/mixCollection', 'models/mix/mixItem', 'models/user/userItem'], function(App, Marionette, vent, utils, MixListLayout, MixListView, MixDetailView, ScheduleView, MixEditView, UserProfileView, UserListView, UserEditView, MixCollection, MixItem, UserItem) {
define(['app', 'marionette', 'vent', 'utils', 'views/mix/mixListLayout', 'views/mix/mixListView', 'views/mix/mixDetailView', 'views/show/scheduleShowLayout', 'views/mix/mixEditView', 'views/user/userProfileView', 'views/user/userListView', 'views/user/userEditView', 'models/mix/mixCollection', 'models/mix/mixItem', 'models/user/userItem'], function(App, Marionette, vent, utils, MixListLayout, MixListView, MixDetailView, ScheduleShowLayout, MixEditView, UserProfileView, UserListView, UserEditView, MixCollection, MixItem, UserItem) {
var DssController;
DssController = (function(_super) {
@@ -29,8 +29,8 @@
DssController.prototype.showSchedule = function() {
var app;
app = require('app');
app.contentRegion.show(new ScheduleView());
return vent.trigger('schedule:show');
app.contentRegion.show(new ScheduleShowLayout());
return vent.trigger('show:schedule:show');
};
DssController.prototype.showMixList = function(options, emptyTemplate) {