summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/ui
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2015-08-18 19:40:50 -0400
committerJules Laplace <jules@okfoc.us>2015-08-18 19:40:50 -0400
commit83649f62ecbd92cc8a27ca47ac141cc3a81210a1 (patch)
treedc62c62458d0d088cbc22903065c7f3b274ce2a9 /public/assets/javascripts/ui
parent72afc148b11ac57c991d699c205675b4b0f1cf70 (diff)
fixed close button
Diffstat (limited to 'public/assets/javascripts/ui')
-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
3 files changed, 9 insertions, 1 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 = "/"