diff options
| author | Julie Lala <jules@okfoc.us> | 2014-06-19 10:22:41 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-06-19 10:22:41 -0400 |
| commit | 9a4730ac59f0cf83b2fdca3672a9f622db6c8aa2 (patch) | |
| tree | ca458e423c6deaa3d6830078124b8028caf11964 | |
| parent | a6115f0430d947c9f752be1c7974a77c346853e8 (diff) | |
indicate placement of serialization code
| -rw-r--r-- | public/assets/javascripts/rectangles/engine/scenery/_scenery.js | 18 | ||||
| -rwxr-xr-x | public/assets/stylesheets/app.css | 2 | ||||
| -rw-r--r-- | server/lib/views.js | 3 |
3 files changed, 20 insertions, 3 deletions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js index 9096de0..0dd1a4d 100644 --- a/public/assets/javascripts/rectangles/engine/scenery/_scenery.js +++ b/public/assets/javascripts/rectangles/engine/scenery/_scenery.js @@ -63,7 +63,23 @@ var Scenery = new function(){ } base.remove = function(id){ - base.images.splcie(id) + var removed = _.remove(base.media, function(media){ return media.id == id }) + removed.forEach(function(media){ + // cleanup + }) + } + + base.serialize = function(){ + var scenery = base.media.map(function(media){ + return media.serialize() + }) + return scenery + } + + base.deserialize = function(scenery){ + scenery.forEach(function(function(media){ + // find the wall this is supposed to be on + }) } return base diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 8ab4a3f..93d68ca 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -847,6 +847,7 @@ h5 { .myMedia { -webkit-transition: opacity 0.3s ease-in-out; transition: opacity 0.3s ease-in-out; + width: 100%; } .myMedia.inactive { opacity:0; @@ -861,6 +862,7 @@ h5 { transform: translateX(120%); transition: transform 0.3s ease-in-out; padding-top:40px; + width: 100%; } .foundMedia.active { diff --git a/server/lib/views.js b/server/lib/views.js index 3ad7369..bcb0e90 100644 --- a/server/lib/views.js +++ b/server/lib/views.js @@ -27,8 +27,7 @@ views.builder = function (req, res) { } views.modal = function (req, res) { - res.render('modal', { - }); + res.render('modal'); }; views.home = function (req, res) { |
