summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--public/assets/javascripts/mx/extensions/mx.movements.js6
-rw-r--r--public/assets/javascripts/rectangles/engine/rooms/_walls.js2
2 files changed, 5 insertions, 3 deletions
diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 386819a..5b1e2de 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -139,15 +139,15 @@ MX.Movements = function (cam) {
app.controller.mediaViewer.hide()
$(".inuse").removeClass("inuse")
}
- else if (app.controller.colorControl.$el.hasClass('active')) {
+ else if (app.controller.colorControl && app.controller.colorControl.$el.hasClass('active')) {
app.controller.colorControl.hide()
$(".inuse").removeClass("inuse")
}
- else if (app.controller.wallpaperPicker.$el.hasClass('active')) {
+ else if (app.controller.wallpaperPicker && app.controller.wallpaperPicker.$el.hasClass('active')) {
app.controller.wallpaperPicker.hide()
$(".inuse").removeClass("inuse")
}
- else if (app.controller.presets.$el.hasClass('active')) {
+ else if (app.controller.presets && app.controller.presets.$el.hasClass('active')) {
app.controller.presets.hide()
$(".inuse").removeClass("inuse")
}
diff --git a/public/assets/javascripts/rectangles/engine/rooms/_walls.js b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
index fe5913d..29338cb 100644
--- a/public/assets/javascripts/rectangles/engine/rooms/_walls.js
+++ b/public/assets/javascripts/rectangles/engine/rooms/_walls.js
@@ -181,6 +181,8 @@
wall.wallpaper("none")
})
},
+ outline: function(){
+ },
floor: function(){
Walls.floors.forEach(function(floor){
if (floor.ceiling) return