esc cancels more things

3 files changed, 10 insertions, 19 deletions

diff --git a/public/assets/javascripts/ui/editor/MediaEditor.js b/public/assets/javascripts/ui/editor/MediaEditor.js
index eaa3134..59fdc70 100644
--- a/public/assets/javascripts/ui/editor/MediaEditor.js
+++ b/public/assets/javascripts/ui/editor/MediaEditor.js
@@ -181,6 +181,7 @@ var MediaEditor = FormView.extend({
 			var scenery = this.scenery
 			this.hide()
 			Scenery.remove(scenery.id)
+			Scenery.resize.hide()
 		}.bind(this))
 	},
 
diff --git a/public/assets/javascripts/ui/editor/MediaViewer.js b/public/assets/javascripts/ui/editor/MediaViewer.js
index 15245cf..0ac6755 100644
--- a/public/assets/javascripts/ui/editor/MediaViewer.js
+++ b/public/assets/javascripts/ui/editor/MediaViewer.js
@@ -136,19 +136,6 @@ var MediaViewer = ModalView.extend({
 			return
 		}
 
-// 		else {
-// 			this.picked = {}
-// 			this.picked.media = media
-// 			this.picked.image = image
-// 		}
-// 	},
-// 	
-// 	drag: function(e){
-// 		if (! this.pickedMedia) return
-// 		var media = this.picked.media
-// 		var image = this.picked.image
-// 		this.picked = null
-
 		this.hide()
 		
 		var $ants = $('.ants');
@@ -156,8 +143,6 @@ var MediaViewer = ModalView.extend({
 		
 		Scenery.nextMedia = media
 
-// 		console.log(media.type)
-
 		switch (media.type) {
 			case "video":
 				$floatingImg.attr('src', '/assets/img/playbutton.png')
@@ -185,12 +170,13 @@ var MediaViewer = ModalView.extend({
 			$floatingImg.attr('src', '')
 			$(window).off('mousemove', _followCursor)
 			$(window).off('mousedown', _hideCursor)
+      app.off('cancel-scenery', _hideCursor)
 			$floatingImg.parent().removeClass('edit')
 		}
 		$(window).on('mousemove', _followCursor)
 		$(window).on('mousedown', _hideCursor)
+		app.on('cancel-scenery', _hideCursor)
 		$ants.addClass('edit')
 		_followCursor(e)
 	},
-
 })
diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index 0dd2921..3756e88 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -97,11 +97,15 @@ var WallpaperPicker = UploadView.extend({
 					left: (e.pageX + 10) + 'px',
 				});
 			}
-			$(window).on('mousemove', _followCursor)
-			$(window).one('click', function () {
+			function _hideCursor (e) {
 				$(window).off('mousemove', _followCursor)
+				$(window).off('click', _hideCursor)
+				app.off('cancel-wallpaper', _hideCursor)
 				$floatingSwatch.removeClass("scissors").hide()
-			});
+			}
+			$(window).on('mousemove', _followCursor)
+			$(window).one('click', _hideCursor);
+      app.on('cancel-wallpaper', _hideCursor)
 			$floatingSwatch.show()
 			_followCursor(e);
 		})