diff options
| author | ryderr <r@okfoc.us> | 2014-10-01 12:46:47 -0400 |
|---|---|---|
| committer | ryderr <r@okfoc.us> | 2014-10-01 12:46:47 -0400 |
| commit | d781e1a412a4f91c150273612ebefba221fa6e5e (patch) | |
| tree | 71629a8f120e2707c5127c091af97ffc8d56efaf /public/assets/javascripts/mx/extensions | |
| parent | 9adab52b26614788e99be76311d2cd3506e0595c (diff) | |
| parent | 397738f8ce460fd76c10e5a5e832720804016964 (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 | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/public/assets/javascripts/mx/extensions/mx.movements.js b/public/assets/javascripts/mx/extensions/mx.movements.js index 669a7f4..c02c285 100644 --- a/public/assets/javascripts/mx/extensions/mx.movements.js +++ b/public/assets/javascripts/mx/extensions/mx.movements.js @@ -99,7 +99,20 @@ MX.Movements = function (cam) { break case 27: // esc - map.toggle() + if (Scenery.nextMedia) { + Scenery.nextMedia = null + app.tube('cancel-scenery') + } + else if (Scenery.nextWallpaper) { + Scenery.nextWallpaper = null + app.tube('cancel-wallpaper') + } + else if (app.controller && app.controller.mediaViewer && app.controller.mediaViewer.$el.hasClass("active")) { + app.controller.mediaViewer.hide() + } + else { + map && map.toggle && map.toggle() + } break } }) |