From a8c9c1198a8872c7ebcf3db920d2de3fe721bfc3 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 21 Oct 2014 13:03:03 -0400
Subject: move fileupload out

---
 .../javascripts/ui/editor/WallpaperPicker.js       |  4 +---
 views/controls/editor/media-drawer.ejs             | 24 +++++++++++-----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/public/assets/javascripts/ui/editor/WallpaperPicker.js b/public/assets/javascripts/ui/editor/WallpaperPicker.js
index 994fe74..6e0d5c6 100644
--- a/public/assets/javascripts/ui/editor/WallpaperPicker.js
+++ b/public/assets/javascripts/ui/editor/WallpaperPicker.js
@@ -40,9 +40,6 @@ var WallpaperPicker = UploadView.extend({
 	hide: function(){
 		this.toggle(false)
 	},
-// 	hide: function(){
-// 		this.__super__.hide.call(this)
-// 	},
   
 	toggle: function (state) {
 	  Scenery.nextWallpaper = null
@@ -158,6 +155,7 @@ var WallpaperPicker = UploadView.extend({
 	pickWall: function(wall){
     if (! wall.background || wall.background.src == "none") {
       this.$wallpaperResizeControls.addClass('disabled')
+      this.$scale.val( 0.0 )
       return;
     }
     this.$wallpaperResizeControls.removeClass('disabled')
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index 1404d86..3e64cc3 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -21,17 +21,6 @@
 		<a href="#" class="viewMore btn">view more</a>
 	</div>
 
-	<span class="fileUpload">
-		<input type="hidden" name="_csrf" value="[[- token ]]">
-		<form>
-			<span class="ion-ios7-upload-outline upload-icon"></span><br>
-			Upload File
-			<input type="file" accept="image/*" multiple>
-		</form>
-		<small>~ or ~</small><br>
-		<input type="text" placeholder="Enter Vimeo or YouTube or image link" class="url">
-	</span>
-	
 	<div class="foundMedia">
 	  <span class="container"></span>
  	</div>
@@ -40,4 +29,15 @@
 	  <span class="container"></span>
  	</div>
  	
-</div>
\ No newline at end of file
+</div>
+
+<span class="fileUpload">
+  <input type="hidden" name="_csrf" value="[[- token ]]">
+  <form>
+    <span class="ion-ios7-upload-outline upload-icon"></span><br>
+    Upload File
+    <input type="file" accept="image/*" multiple>
+  </form>
+  <small>~ or ~</small><br>
+  <input type="text" placeholder="Enter Vimeo or YouTube or image link" class="url">
+</span>
-- 
cgit v1.2.3-70-g09d2