merge

1 files changed, 21 insertions, 5 deletions

diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index 0dd2921..7f9b8f7 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -39,6 +39,10 @@ var WallpaperPicker = UploadView.extend({
 		this.loaded = true
 		if (data && data.length) {
 		  data.forEach(this.add.bind(this))
+		  this.$(".txt").hide()
+		}
+		else {
+		  this.$(".txt").show()
 		}
     this.toggle(true)
 	},
@@ -50,6 +54,7 @@ var WallpaperPicker = UploadView.extend({
 	  swatch.style.backgroundImage = "url(" + media.url + ")"
 	  this.$swatches.append(swatch)
     this.$swatches.show()
+    this.$(".txt").hide()
 	},
 
 	toggle: function (state) {
@@ -71,14 +76,21 @@ var WallpaperPicker = UploadView.extend({
 	},
 	
 	pick: function(e){
+	  app.tube('cancel-wallpaper')
     var $swatch = $(e.currentTarget)
     this.follow( e, $swatch.css('background-image') )
     this.$remove.show()
   },
   
 	remove: function(e){
-	  this.follow( e, "none" )
-	  $(".floatingSwatch").addClass("scissors")
+	  if (Scenery.nextWallpaper) {
+      Scenery.nextWallpaper = null
+      app.tube('cancel-wallpaper')
+	  }
+	  else {
+      this.follow( e, "none" )
+      $(".floatingSwatch").addClass("scissors")
+	  }
 	},
 
   follow: function(e, wallpaper, icon){
@@ -97,11 +109,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);
 		})