summaryrefslogtreecommitdiff
path: root/public/assets/javascripts
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts')
-rw-r--r--public/assets/javascripts/ui/blueprint/BlueprintEditor.js30
-rw-r--r--public/assets/javascripts/ui/blueprint/BlueprintScale.js0
-rw-r--r--public/assets/javascripts/ui/blueprint/BlueprintUpload.js35
-rw-r--r--public/assets/javascripts/ui/blueprint/BlueprintView.js3
4 files changed, 42 insertions, 26 deletions
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintEditor.js b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
new file mode 100644
index 0000000..227c1c8
--- /dev/null
+++ b/public/assets/javascripts/ui/blueprint/BlueprintEditor.js
@@ -0,0 +1,30 @@
+
+var BlueprintEditor = ModalView.extend({
+ el: ".blueprintEditor",
+
+ events: {
+ "change [name=blueprint-dimensions]": "changeDimensions",
+ "change [name=blueprint-units]": "changeUnits",
+ "click #saveBlueprint": "save",
+ },
+
+ initialize: function(){
+ this.$blueprintMap = this.$("#blueprintMap")
+ this.$blueprintDimensionsRapper = this.$("#blueprintDimensions")
+ this.$dimensions = this.$("[name=blueprint-dimensions]")
+ this.$units = this.$("[name=blueprint-units]")
+ this.$save = this.$("#saveBlueprint")
+
+ this.map = new Map ({ type: 'ortho' })
+
+ this.$blueprintMap.append(this.map.el)
+ },
+
+ changeDimensions: function(){
+ },
+ changeUnits: function(){
+ },
+ save: function(){
+ },
+
+})
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintScale.js b/public/assets/javascripts/ui/blueprint/BlueprintScale.js
deleted file mode 100644
index e69de29..0000000
--- a/public/assets/javascripts/ui/blueprint/BlueprintScale.js
+++ /dev/null
diff --git a/public/assets/javascripts/ui/blueprint/BlueprintUpload.js b/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
index fd3a659..9467715 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintUpload.js
@@ -1,5 +1,5 @@
-var BlueprintUploadView = UploadView.extend({
+var BlueprintUpload = UploadView.extend({
el: ".blueprintUpload",
mediaTag: "blueprint",
@@ -14,9 +14,6 @@ var BlueprintUploadView = UploadView.extend({
"keydown .url": "enterSetUrl",
"click .blueprint": "choose",
- "change [name=blueprint-dimensions]": "changeDimensions",
- "change [name=blueprint-units]": "changeUnits",
- "click #saveBlueprint": "save",
},
initialize: function(opt){
@@ -24,15 +21,8 @@ var BlueprintUploadView = UploadView.extend({
this.__super__.initialize.call(this)
this.$url = this.$(".url")
+ this.$blueprints = this.$(".blueprints")
- this.$blueprintMap = this.$("#blueprintMap")
- this.$blueprintDimensionsRapper = this.$("#blueprintDimensions")
- this.$dimensions = this.$("[name=blueprint-dimensions]")
- this.$units = this.$("[name=blueprint-units]")
- this.$save = this.$("#saveBlueprint")
-
- this.map = new Map ({ type: 'ortho' })
-
this.load()
},
@@ -52,13 +42,6 @@ var BlueprintUploadView = UploadView.extend({
}
},
- append: function(media){
- var $el = $("<div>")
- $el.data("id", media._id)
- $el.addClass("blueprint")
- this.$blueprints.append($el)
- },
-
pick: function(e){
var $el = $(e.currentTarget)
// load map with it
@@ -112,11 +95,13 @@ var BlueprintUploadView = UploadView.extend({
add: function(media){
this.append(media)
},
- changeDimensions: function(){
- },
- changeUnits: function(){
- },
- save: function(){
- },
+ append: function(media){
+ var $el = $("<img>")
+ $el.attr("src", media.url)
+ $el.data("id", media._id)
+ $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 f7ee13e..40c61d7 100644
--- a/public/assets/javascripts/ui/blueprint/BlueprintView.js
+++ b/public/assets/javascripts/ui/blueprint/BlueprintView.js
@@ -11,7 +11,8 @@ var BlueprintView = View.extend({
// this.settings = new BuilderSettings ({ parent: this })
// this.colorControl = new ColorControl ({ parent: this })
// this.cursor = new HelpCursor({ parent: this })
- this.blueprintUpload = new BlueprintUploadView ({ parent: this })
+ this.blueprintUpload = new BlueprintUpload ({ parent: this })
+ this.blueprintEditor = new BlueprintEditor ({ parent: this })
},
load: function(name){