summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--public/assets/javascripts/ui/blueprint/BlueprintScaler.js4
-rw-r--r--public/assets/javascripts/ui/blueprint/BlueprintUploader.js1
-rw-r--r--public/assets/javascripts/ui/lib/ModalView.js5
-rw-r--r--views/controls/editor/media-drawer.ejs2
-rw-r--r--views/partials/header.ejs4
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