diff options
| author | ryderr <r@okfoc.us> | 2014-10-17 13:00:36 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-10-17 13:00:36 -0400 |
| commit | c99a5651e30838db43ee6f1b24a9fdc71d7affff (patch) | |
| tree | ac470f7ba26b315d8186e09e90e2311a0a9dc4e7 /public/assets/javascripts/mx/extensions | |
| parent | 631da6497b18393daf302e01842a3c0c90b346e3 (diff) | |
| parent | 38a948be224d704589fa203520f224615a81c7d9 (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public/assets/javascripts/mx/extensions')
| -rw-r--r-- | public/assets/javascripts/mx/extensions/mx.movements.js | 6 |
1 files changed, 3 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") } |