4 files changed, 50 insertions, 15 deletions

diff --git a/public/assets/javascripts/rectangles/engine/map/ui/ortho.js b/public/assets/javascripts/rectangles/engine/map/ui/ortho.js
index 52f7339..5be7446 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui/ortho.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui/ortho.js
@@ -81,7 +81,9 @@ Map.UI.Ortho = function(map){
 	}
 	base.set_tool = function(s){
 	  console.log("set tool to", s)
-	  base.tools[currentTool].cancel()
+	  if (base.tools[currentTool]) {
+	    base.tools[currentTool].cancel()
+	  }
 	  currentTool = s
 	  tool = base.tools[currentTool]
 	}
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
index 227c1c8..e11b61e 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintScaler.js
@@ -1,6 +1,6 @@
 
-var BlueprintEditor = ModalView.extend({
-	el: ".blueprintEditor",
+var BlueprintScaler = ModalView.extend({
+	el: ".blueprintScaler",
 	
 	events: {
     "change [name=blueprint-dimensions]": "changeDimensions",
@@ -15,9 +15,22 @@ var BlueprintEditor = ModalView.extend({
     this.$units = this.$("[name=blueprint-units]")
     this.$save = this.$("#saveBlueprint")
 
-    this.map = new Map ({ type: 'ortho' })
-
-    this.$blueprintMap.append(this.map.el)
+    this.map = map = new Map ({
+      type: "ortho",
+      el: this.$blueprintMap.get(0),
+      width: window.innerWidth/2,
+      height: window.innerHeight,
+      zoom: -2,
+      zoom_min: -6.2,
+      zoom_max: 1,
+    })
+    map.ui.add_tool("arrow", new ArrowTool)
+    map.ui.add_tool("position", new PositionTool)
+    map.ui.set_tool("position")
+	},
+	
+	pick: function(){
+    
 	},
 
 	changeDimensions: function(){
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUpload.js b/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
index 9467715..deb1075 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
@@ -13,7 +13,8 @@ var BlueprintUpload = UploadView.extend({
     "change .url": "enterUrl",
     "keydown .url": "enterSetUrl",
     
-    "click .blueprint": "choose",
+    "click .blueprint": "pick",
+    "click .remove": "destroy",
   },
 	
 	initialize: function(opt){
@@ -34,25 +35,33 @@ var BlueprintUpload = UploadView.extend({
 	populate: function(data){
 		this.loaded = true
 		if (data && data.length) {
+		  this.$blueprints.show()
 		  data.forEach(this.append.bind(this))
-		  this.$(".txt").hide()
+		  this.show()
 		}
 		else {
-		  this.$(".txt").show()
+		  this.show()
 		}
 	},
 	
 	pick: function(e){
 	  var $el = $(e.currentTarget)
-	  // load map with it
+	  var media = $el.data("media")
+	  this.hide()
+	  this.parent.blueprintScaler.pick(media)
 	},
   
-	destroy: function(_id, cb){
+	destroy: function(e){
+	  e.stopPropagation()
+	  var $el = $(e.currentTarget)
+	  var _id = $el.closest(".blueprint").data("id")
+    $el.remove()
 		$.ajax({
 			type: "delete",
 			url: this.destroyAction,
 			data: { _id: _id, _csrf: $("[name=_csrf]").val() }
-		}).complete(cb || function(){})
+		}).complete(function(){
+		})
 	},
 	
 	show: function(){
@@ -93,13 +102,24 @@ var BlueprintUpload = UploadView.extend({
 	},
 	
 	add: function(media){
+    this.$blueprints.show()
 	  this.append(media)
+	  this.hide()
+	  this.parent.blueprintScaler.pick(media)
 	},
 
 	append: function(media){
-	  var $el = $("<img>")
-	  $el.attr("src", media.url)
+	  var $el = $("<span>")
+	  var img = new Image ()
+	  img.src = media.url
+	  var remove = document.createElement("span")
+	  remove.className = "remove"
+	  remove.innerHTML = "<span>x</span>"
+	  
 	  $el.data("id", media._id)
+	  $el.data("media", media)
+	  $el.append(img)
+	  $el.append(remove)
 	  $el.addClass("blueprint")
 	  this.$blueprints.append($el)
 	},
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintView.js b/public/assets/javascripts/ui/blueprint/BlueprintView.js
index 40c61d7..a803f12 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -12,7 +12,7 @@ var BlueprintView = View.extend({
 // 		this.colorControl = new ColorControl ({ parent: this })
 // 		this.cursor = new HelpCursor({ parent: this })
     this.blueprintUpload = new BlueprintUpload ({ parent: this })
-    this.blueprintEditor = new BlueprintEditor ({ parent: this })
+    this.blueprintScaler = new BlueprintScaler ({ parent: this })
 	},
 
 	load: function(name){