summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/mx/extensions
diff options
context:
space:
mode:
authorJulie Lala <jules@okfoc.us>2014-10-14 20:00:59 -0400
committerJulie Lala <jules@okfoc.us>2014-10-14 20:33:29 -0400
commit1b152e66ad8d7aa1c5511152991e648308f8918b (patch)
treefafbf1de89a147adf8f79b1f866c023a63a09482 /public/assets/javascripts/mx/extensions
parent527a65ca570891ff473dbdac36d41b1be60196f1 (diff)
fixed-position close box
fixed-position close box &c
Diffstat (limited to 'public/assets/javascripts/mx/extensions')
-rw-r--r--public/assets/javascripts/mx/extensions/mx.movements.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js
index 268a1c7..5ba5d69 100644
--- a/public/assets/javascripts/mx/extensions/mx.movements.js
+++ b/public/assets/javascripts/mx/extensions/mx.movements.js
@@ -127,9 +127,12 @@ MX.Movements = function (cam) {
Scenery.nextWallpaper = null
app.tube('cancel-wallpaper')
}
- else if (app.controller && app.controller.mediaViewer && app.controller.mediaViewer.$el.hasClass("active")) {
+ else if (app.controller.mediaViewer && app.controller.mediaViewer.$el.hasClass("active")) {
app.controller.mediaViewer.hide()
}
+ else if (app.controller.lightControl.$el.hasClass('active')) {
+ app.controller.lightControl.hide()
+ }
else {
app.controller.toolbar.toggleMap()
}