summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/rectangles/models
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2015-04-01 19:30:22 -0400
committerJules Laplace <jules@okfoc.us>2015-04-01 19:30:22 -0400
commit39f1a7136567ae7e0afbf085732853cc86123393 (patch)
treea29c5f5ba7359ac8a7e51555e9ab28e729ff2344 /public/assets/javascripts/rectangles/models
parent3916282fc61cb1143dfc33d79dfc3169293b0969 (diff)
stub in 3d object ui
Diffstat (limited to 'public/assets/javascripts/rectangles/models')
-rw-r--r--public/assets/javascripts/rectangles/models/floor.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/public/assets/javascripts/rectangles/models/floor.js b/public/assets/javascripts/rectangles/models/floor.js
index ac1f8c9..439c16a 100644
--- a/public/assets/javascripts/rectangles/models/floor.js
+++ b/public/assets/javascripts/rectangles/models/floor.js
@@ -68,8 +68,12 @@
}
return
}
-
- if (Scenery.nextWallpaper) {
+
+ if (Scenery.nextMedia) {
+ e.preventDefault()
+ //
+ }
+ else if (Scenery.nextWallpaper) {
var oldState = base.serialize()
base.wallpaper(Scenery.nextWallpaper)
// Scenery.nextWallpaper = null