From 83649f62ecbd92cc8a27ca47ac141cc3a81210a1 Mon Sep 17 00:00:00 2001
From: Jules Laplace <jules@okfoc.us>
Date: Tue, 18 Aug 2015 19:40:50 -0400
Subject: fixed close button

---
 public/assets/javascripts/ui/blueprint/BlueprintScaler.js   | 4 +++-
 public/assets/javascripts/ui/blueprint/BlueprintUploader.js | 1 +
 public/assets/javascripts/ui/lib/ModalView.js               | 5 +++++
 views/controls/editor/media-drawer.ejs                      | 2 --
 views/partials/header.ejs                                   | 4 +++-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/public/assets/javascripts/ui/blueprint/BlueprintScaler.js b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
index 5bd2229..cd370ef 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
@@ -1,7 +1,9 @@
 
 var BlueprintScaler = ModalFormView.extend(AnimatedView.prototype).extend({
 	el: ".blueprintScaler",
-	
+
+	fixedClose: true,
+
 	action: "/api/blueprint/scale",
 	
 	events: {
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
index 676976f..6d13817 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintUploader.js
@@ -39,6 +39,7 @@ var BlueprintUploader = UploadView.extend({
       this.parent.scaler.pick(data[0])
 		}
 		else {
+		  this.parent.scaler.hideClose()
 		  this.show()
 		}
 	},
diff --git a/public/assets/javascripts/ui/lib/ModalView.js b/public/assets/javascripts/ui/lib/ModalView.js
index 6f1c729..e0070ce 100644
--- a/public/assets/javascripts/ui/lib/ModalView.js
+++ b/public/assets/javascripts/ui/lib/ModalView.js
@@ -35,6 +35,11 @@ var ModalView = View.extend({
     $("body").removeClass("noOverflow");
   },
   
+  hideClose: function(){
+    $("#fixed_close").removeClass("active")
+    $("#fixed_close").unbind("click", this.hide.bind(this))
+  },
+  
   close: function(){
     if (window.isModalView) {
       window.location.pathname = "/"
diff --git a/views/controls/editor/media-drawer.ejs b/views/controls/editor/media-drawer.ejs
index bb623f2..8070941 100644
--- a/views/controls/editor/media-drawer.ejs
+++ b/views/controls/editor/media-drawer.ejs
@@ -3,8 +3,6 @@
 	<img class="floatingImg">
 </div>
 
-<span class="close" id="fixed_close">X</span>
-
 <div class="mediaDrawer fixed animate mediaViewer">
 	<h2>
 	  <a href="#" class="userToggle active">Your Media</a>
diff --git a/views/partials/header.ejs b/views/partials/header.ejs
index 2acf2bc..bb8fc6e 100644
--- a/views/partials/header.ejs
+++ b/views/partials/header.ejs
@@ -78,4 +78,6 @@
 	<a href="/signin" data-role="show-signin-modal" class="signIn topLink">Sign In</a>
 [[ } ]]
 </span>
-</div>
\ No newline at end of file
+</div>
+
+<span class="close" id="fixed_close">X</span>
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2