From 16558222941e1aebdefdd520bd70e06e80632d39 Mon Sep 17 00:00:00 2001 From: Julie Lala Date: Wed, 18 Jun 2014 01:09:34 -0400 Subject: etc --- public/assets/javascripts/ui/editor/MediaViewer.js | 2 +- server/lib/api/projects.js | 2 + server/lib/schemas/Project.js | 4 ++ views/controls/editor/media-drawer.ejs | 64 +++++----------------- 4 files changed, 21 insertions(+), 51 deletions(-) diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js index e48c5b6..a75f8dc 100644 --- a/public/assets/javascripts/ui/editor/MediaViewer.js +++ b/public/assets/javascripts/ui/editor/MediaViewer.js @@ -44,7 +44,7 @@ var MediaViewer = ModalView.extend({ populate: function(data){ this.loaded = true - data.forEach($.proxy(this.add, this)) + data && data.forEach($.proxy(this.add, this)) this.__super__.show.call(this) }, diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js index 99ed9fe..e8f80db 100644 --- a/server/lib/api/projects.js +++ b/server/lib/api/projects.js @@ -35,6 +35,8 @@ var projects = { data.slug = util.slugify(data.name) data.user_id = req.user._id data.rooms = JSON.parse(data.rooms) + data.walls = JSON.parse(data.walls) + data.media = JSON.parse(data.media) data.startPosition = JSON.parse(data.startPosition) upload.put("projects", req.files.thumbnail, { diff --git a/server/lib/schemas/Project.js b/server/lib/schemas/Project.js index 6f6ec7a..edfc3d6 100644 --- a/server/lib/schemas/Project.js +++ b/server/lib/schemas/Project.js @@ -27,6 +27,10 @@ var ProjectSchema = new mongoose.Schema({ type: String, default: "" }, + rooms: [mongoose.Schema.Types.Mixed], + walls: [mongoose.Schema.Types.Mixed], + media: [mongoose.Schema.Types.Mixed], + startPosition: mongoose.Schema.Types.Mixed, user_id: { type: mongoose.Schema.ObjectId, index: true }, created_at: { type: Date }, updated_at: { type: Date }, diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs index c3d7bd4..8375042 100644 --- a/views/controls/editor/media-drawer.ejs +++ b/views/controls/editor/media-drawer.ejs @@ -19,27 +19,9 @@

Your Media – Found Media


delete media

- - - - - - - - - - - - - - - - - - - - - +
+ +
@@ -55,44 +37,26 @@ -
- -
- + - + - + - + - + + + + + + + - - - - - - - - - - - - - - - - - - - - -
\ No newline at end of file -- cgit v1.2.3-70-g09d2