store blueprint scale on server

2 files changed, 12 insertions, 7 deletions

diff --git a/public/assets/javascripts/ui/blueprint/BlueprintScaler.js b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
index addf9a9..c393cfb 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
@@ -2,16 +2,17 @@
 var BlueprintScaler = ModalFormView.extend({
 	el: ".blueprintScaler",
 	
-	method: "/api/media/scale",
+	action: "/api/media/scale",
 	
 	events: {
     "change [name=blueprint-dimensions]": "changeDimensions",
     "change [name=blueprint-units]": "changeUnits",
     "click .uploadNewBlueprint": "showBlueprintUpload",
-    "click #saveBlueprint": "save",
 	},
 	
-	initialize: function(){
+	initialize: function(opt){
+	  this.parent = opt.parent
+	  
     this.$blueprintMap = this.$("#blueprintMap")
     this.$blueprintDimensionsRapper = this.$("#blueprintDimensions")
     this.$dimensions = this.$("[name=blueprint-dimensions]")
@@ -46,8 +47,10 @@ var BlueprintScaler = ModalFormView.extend({
 	pick: function(media){
 	  this.media = media
     
-    if (!! media.scale) {
+    if (!! media.units) {
       this.parent.useFloorplan(media)
+      this.hide()
+      return
     }
 
     this.floorplan.load({ media: media, keepImage: true })
@@ -115,13 +118,14 @@ var BlueprintScaler = ModalFormView.extend({
 	  if (this.lineTool.line.length !== 2) return 0
 	  var line = this.lineTool.line
 	  return dist( line[0].a, line[0].b, line[1].a, line[1].b )
-	}
+	},
 
 	validate: function(){
 	  var val = this.$dimensions.unitVal()
 	  var errors = []
 	  if (! this.lineLength()) {
 	    errors.push("no line")
+      this.$dimensions.val("")
 	    alert("Please click two corners of a wall and then specify how long it is in feet or meters.")
 	  }
 	  else if (val == 0) {
@@ -144,7 +148,8 @@ var BlueprintScaler = ModalFormView.extend({
 	
 	success: function(){
 	  this.animating = false
-    this.parent.useFloorplan(media)
+    this.parent.useFloorplan(this.media)
+    this.hide()
 	},
 
 })
diff --git a/public/assets/javascripts/ui/lib/FormView.js b/public/assets/javascripts/ui/lib/FormView.js
index f5845e7..33effc8 100644
--- a/public/assets/javascripts/ui/lib/FormView.js
+++ b/public/assets/javascripts/ui/lib/FormView.js
@@ -63,7 +63,7 @@ var FormView = View.extend({
   save: function(e, successCallback, errorCallback){
     e && e.preventDefault()
 
-    this.$errors.hide().css("opacity", 0.0);
+    this.$errors && this.$errors.hide().css("opacity", 0.0);
     
     if (this.validate) {
       var errors = this.validate()