hide wallpaper tutorial message once wallpaper is uploaded

2 files changed, 17 insertions, 3 deletions

diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index 3756e88..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){
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 1446c60..9e65086 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1209,6 +1209,7 @@ iframe.embed {
   float: none;
 }
 .wallpaper form {
+  position: relative;
   padding: 2px 0 0 0;
   font-size: 14px;
   font-weight: 300;
@@ -1252,7 +1253,8 @@ iframe.embed {
 }
 .wallpaperUpload input[type="file"]{
 	position: absolute;
-	margin-top: -30px;
+  top: 0;
+  left: 0;
 	background: blue;
 	height: 28px;
 	width: 100%;