diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-06-23 15:32:14 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-06-23 15:32:14 -0400 |
| commit | b97f3d39ac0e387385aae2685dbe830ee53a686c (patch) | |
| tree | 03c8df81703e552851af9e4096ee7deb488f7381 /public/assets/javascripts/rectangles/engine/scenery/_scenery.js | |
| parent | 0b3ccda85b46183bd17cb765ab20bddeeae1a2e9 (diff) | |
| parent | b0ab3271996d542e718e8e3fc910053d60cf81f6 (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/rectangles/engine/scenery/_scenery.js')
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/scenery/_scenery.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js index 143a4d9..74801e9 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js +++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js @@ -12,16 +12,16 @@ var Scenery = new function(){ base.resize.init() } - base.add = function(wall, media){ + base.add = function(wall, media, id){ var scene_media switch (media.type) { case 'image': - scene_media = new Scenery.types.image ({ media: media, wall: wall }) + scene_media = new Scenery.types.image ({ media: media, wall: wall, id: id }) break case 'youtube': case 'vimeo': - scene_media = new Scenery.types.video ({ media: media, wall: wall }) + scene_media = new Scenery.types.video ({ media: media, wall: wall, id: id }) break } @@ -64,7 +64,7 @@ var Scenery = new function(){ base.deserialize = function(scenery_data){ scenery_data.forEach(function(data){ var wall = Rooms.walls[data.wall_id] - var scene_media = base.add(wall, data.media) + var scene_media = base.add(wall, data.media, data.id) scene_media.deserialize(data) }) } |
