summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulie Lala <jules@okfoc.us>2014-06-18 01:09:34 -0400
committerJulie Lala <jules@okfoc.us>2014-06-18 01:09:34 -0400
commit16558222941e1aebdefdd520bd70e06e80632d39 (patch)
treeb0040b1d3c5b08e65bb63c84f14cd5061f8d86f7
parentbe42fb25f2a497d25dd805b699bf21ef1ab4dbfa (diff)
etc
-rw-r--r--public/assets/javascripts/ui/editor/MediaViewer.js2
-rw-r--r--server/lib/api/projects.js2
-rw-r--r--server/lib/schemas/Project.js4
-rw-r--r--views/controls/editor/media-drawer.ejs64
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 @@
<h2><a href="#" class="yourMedia active">Your Media</a> – <a href="#" class="foundToggle">Found Media</a></h2><br>
<h3 class="editBtn" id="deleteMedia">delete media</h3>
<div class="myMedia">
- <span class="mediaContainer">
- <img src="http://2.bp.blogspot.com/-GD6IxUvsdOo/UdrcMFLVYNI/AAAAAAAAF2E/kbRfxMxiUlQ/s1600/okeeffe.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://www.bobkessel.com/wordpress/wp-content/uploads/2009/10/moma-bob-kessel-410.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static1.artsy.net/partner_show_images/52f28f348b3b81f2fc000364/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static3.artsy.net/partner_show_images/52e83674c9dc24397f0000d8/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static0.artsy.net/partner_show_images/52d96d484b84801ef0000273/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static1.artsy.net/partner_show_images/52778616275b24f95c00011d/1/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static1.artsy.net/partner_show_images/52dc65311a1e86be6b000205/large.jpg">
- </span>
+ </div>
+
+ <div class="foundMedia">
<span class="mediaContainer">
<img src="https://d1ycxz9plii3tb.cloudfront.net/post_images/52ec0e20c9dc24f1d8000067/large.jpg">
</span>
@@ -55,44 +37,26 @@
<span class="mediaContainer">
<img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/4f9f3a3ce262e60001000fb3/large.jpg">
</span>
- </div>
-
- <div class="foundMedia">
<span class="mediaContainer">
- <img src="https://d1ycxz9plii3tb.cloudfront.net/post_images/52ec0e20c9dc24f1d8000067/large.jpg">
+ <img src="http://2.bp.blogspot.com/-GD6IxUvsdOo/UdrcMFLVYNI/AAAAAAAAF2E/kbRfxMxiUlQ/s1600/okeeffe.jpg">
</span>
<span class="mediaContainer">
- <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/4e6bf67bc23f490001004579/1/tall.jpg">
+ <img src="http://www.bobkessel.com/wordpress/wp-content/uploads/2009/10/moma-bob-kessel-410.jpg">
</span>
<span class="mediaContainer">
- <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/52dcca28139b2135030002a8/tall.jpg">
+ <img src="http://static1.artsy.net/partner_show_images/52f28f348b3b81f2fc000364/large.jpg">
</span>
<span class="mediaContainer">
- <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/52927bb2b202a3669d000704/larger.jpg">
+ <img src="http://static3.artsy.net/partner_show_images/52e83674c9dc24397f0000d8/large.jpg">
</span>
<span class="mediaContainer">
- <img src="https://d1ycxz9plii3tb.cloudfront.net/additional_images/4f9f3a3ce262e60001000fb3/large.jpg">
+ <img src="http://static0.artsy.net/partner_show_images/52d96d484b84801ef0000273/large.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="http://static1.artsy.net/partner_show_images/52778616275b24f95c00011d/1/large.jpg">
+ </span>
+ <span class="mediaContainer">
+ <img src="http://static1.artsy.net/partner_show_images/52dc65311a1e86be6b000205/large.jpg">
</span>
- <span class="mediaContainer">
- <img src="http://2.bp.blogspot.com/-GD6IxUvsdOo/UdrcMFLVYNI/AAAAAAAAF2E/kbRfxMxiUlQ/s1600/okeeffe.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://www.bobkessel.com/wordpress/wp-content/uploads/2009/10/moma-bob-kessel-410.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static1.artsy.net/partner_show_images/52f28f348b3b81f2fc000364/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static3.artsy.net/partner_show_images/52e83674c9dc24397f0000d8/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static0.artsy.net/partner_show_images/52d96d484b84801ef0000273/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static1.artsy.net/partner_show_images/52778616275b24f95c00011d/1/large.jpg">
- </span>
- <span class="mediaContainer">
- <img src="http://static1.artsy.net/partner_show_images/52dc65311a1e86be6b000205/large.jpg">
- </span>
</div>
</div> \ No newline at end of file