diff options
| author | Julie Lala <jules@okfoc.us> | 2014-10-19 09:00:12 -0400 |
|---|---|---|
| committer | Julie Lala <jules@okfoc.us> | 2014-10-19 09:00:12 -0400 |
| commit | 7fac90101bb5803ba593b0e11950009aa2115045 (patch) | |
| tree | e9eb58bef8f7fba7f3d4e94a1dc36fdf436331a6 /public/assets/javascripts/mx/extensions/mx.movements.js | |
| parent | dca9c5a936f2f7625a52649f712fb092eb64b834 (diff) | |
| parent | a6d479579964014077502db5bc6e3af59c1f317e (diff) | |
Merge branch 'master' of github.com:okfocus/vvalls
Diffstat (limited to 'public/assets/javascripts/mx/extensions/mx.movements.js')
| -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 6b082d1..2993fb6 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") } |