merge

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
 				}
 			})