From 79377c1a06e986abb9146f4a9b41e4d266dc8dfc Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Fri, 24 Oct 2014 16:46:36 -0400
Subject: hit enter to flood message

---
 public/assets/javascripts/ui/editor/WallpaperPicker.js |  9 +++++++++
 public/assets/stylesheets/app.css                      | 14 ++++++++++++++
 views/controls/editor/wallpaper.ejs                    |  6 +++++-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index 6e0d5c6..3b6168e 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -7,6 +7,7 @@ var WallpaperPicker = UploadView.extend({
 	uploadAction: "/api/media/upload",
 
 	events: {
+	  "contextmenu": 'cancel',
 		"mousedown": 'stopPropagation',
 		"click .swatch": 'pick',
 		"click .wallpaperRemove": 'remove',
@@ -120,6 +121,14 @@ var WallpaperPicker = UploadView.extend({
       $(".floatingSwatch").addClass("scissors")
 	  }
 	},
+	
+	cancel: function(e){
+    if (Scenery.nextWallpaper) {
+      e.preventDefault()
+      Scenery.nextWallpaper = null
+      app.tube('cancel-wallpaper')
+    }
+	},
 
   follow: function(e, wallpaper, icon){
     icon = icon || wallpaper
diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css
index 894483d..e5b10e3 100755
--- a/public/assets/stylesheets/app.css
+++ b/public/assets/stylesheets/app.css
@@ -1702,6 +1702,20 @@ input[type="range"]::-webkit-slider-thumb {
 .wallpaperResizeControls span {
   cursor: pointer;
 }
+.floodMessage {
+  display: none;
+  animation: flicker 0.2s infinite;
+  color: black;
+  margin: 5px 5px 49px 5px;
+  font-size: 13px;
+  font-weight: 300;
+  text-align: center;
+}
+@keyframes flicker {
+  49% { color: black; }
+  50% { color: red; }
+  100% { color: red; }
+}
 
 #color-picker {
   position: relative;
diff --git a/views/controls/editor/wallpaper.ejs b/views/controls/editor/wallpaper.ejs
index 6d8f209..3168f1c 100644
--- a/views/controls/editor/wallpaper.ejs
+++ b/views/controls/editor/wallpaper.ejs
@@ -10,7 +10,7 @@
 			<span class="swatch" style="background-image:url(/assets/img/plainpattern2.png)"></span>
   </span>
 
-  <input type="text" class="url" placeholder="Enter image URL 2 Flood...!">
+  <input type="text" class="url" placeholder="Enter image URL">
   
   <div class="wallpaperRemove toolButton">
     <span class="ion-scissors"></span>
@@ -30,6 +30,10 @@
     <input data-role="wallpaper-scale" type="range" min="-4" max="4" step="0.01" value="0.0">
   </div>
 
+  <div class="floodMessage">
+    Hit Enter to Flood the room!
+  </div>
+
 </div>
 
 <div class="floatingSwatch"></div>
-- 
cgit v1.2.3-70-g09d2