diff options
Diffstat (limited to 'public')
8 files changed, 113 insertions, 32 deletions
diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js index 3046d1d..5e00eab 100644 --- a/public/assets/javascripts/rectangles/engine/map/_map.js +++ b/public/assets/javascripts/rectangles/engine/map/_map.js @@ -1,7 +1,7 @@ /* */ -window.ctx = window.w = window.h = null; +window.w = window.h = null; var Map = function(){ var base = this @@ -26,8 +26,7 @@ var Map = function(){ base.zoom = pow(2, base.zoom_exponent) } - var canvas = document.createElement("canvas") - var ctx = window.ctx = canvas.getContext("2d") + var canvas = base.canvas = document.createElement("canvas") var w = window.w = canvas.width = base.dimensions.a var h = window.h = canvas.height = base.dimensions.b document.querySelector("#map").appendChild(canvas) diff --git a/public/assets/javascripts/rectangles/engine/map/draw.js b/public/assets/javascripts/rectangles/engine/map/draw.js index 75e8ad1..7f55e51 100644 --- a/public/assets/javascripts/rectangles/engine/map/draw.js +++ b/public/assets/javascripts/rectangles/engine/map/draw.js @@ -2,10 +2,12 @@ var MapDraw = function(map){ var draw = this + + var ctx = map.canvas.getContext("2d") draw.animate = function(){ ctx.save() - draw.clear_canvas() + draw.clear() draw.ruler() ctx.translate( map.bounds.a * 1/2, map.bounds.b * 1/2) @@ -21,7 +23,7 @@ var MapDraw = function(map){ ctx.restore() } - draw.clear_canvas = function(){ + draw.clear = function(){ ctx.fillStyle = "rgba(255,255,255,0.9)" ctx.clearRect(0,0,w,h) ctx.fillRect(0,0,w,h) diff --git a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js index a51edb9..bcfffcc 100644 --- a/public/assets/javascripts/rectangles/engine/rooms/_rooms.js +++ b/public/assets/javascripts/rectangles/engine/rooms/_rooms.js @@ -22,7 +22,7 @@ var Rooms = new function(){ base.add_with_rect = function(rect){ var room = new Room({ rect: rect, - height: 500 // quantize(randrange(300,800), 50), + height: 500 }) base.add(room) } @@ -38,6 +38,7 @@ var Rooms = new function(){ base.forEach = function(f){ return base.values().forEach(f) } + base.map = function(f){ return base.values().map(f) } @@ -50,12 +51,11 @@ var Rooms = new function(){ var rooms = base.map(function(room){ return room.serialize() }) - var rooms_data = { rooms: rooms } - return rooms_data + return rooms } base.deserialize = function(rooms_data){ - rooms_data.rooms.forEach(function(data){ + rooms_data.forEach(function(data){ var rect = new Rect(data.rect.x[0], data.rect.y[0], data.rect.x[1], data.rect.y[1]) var room = new Room({ id: data.id, @@ -64,6 +64,7 @@ var Rooms = new function(){ }) base.add(room) }) + Rooms.clipper.update() } base.uid = (function(){ diff --git a/public/assets/javascripts/ui/builder/BuilderSettings.js b/public/assets/javascripts/ui/builder/BuilderSettings.js index a7a0555..0eb5dfa 100644 --- a/public/assets/javascripts/ui/builder/BuilderSettings.js +++ b/public/assets/javascripts/ui/builder/BuilderSettings.js @@ -6,6 +6,7 @@ var BuilderSettings = FormView.extend({ updateAction: "/api/layouts/edit", events: { + "keydown [name=name]": 'enterSubmit', "click [data-role='save-layout']": 'save', }, @@ -13,21 +14,36 @@ var BuilderSettings = FormView.extend({ this.parent = opt.parent this.__super__.initialize.call(this) + this.$id = this.$("[name=_id]") + this.$csrf = this.$("[name=_csrf]") this.$name = this.$("[name=name]") - this.$newName = this.$("[name=new_name]") this.$privacy = this.$("[name=privacy]") }, load: function(data){ + this.$id.val(data._id) this.$name.val(data.name) - this.$newName.val(data.name) - this.$privacy.find("[value=" + data.privacy + "]").prop('checked', true); + this.$privacy.find("[value=" + data.privacy + "]").prop('checked', true) + + console.log(data) + data.rooms && Rooms.deserialize(data.rooms) + data.startPosition && scene.camera.move(data.startPosition) + + this.action = data.isNew ? this.createAction : this.updateAction }, toggle: function(){ this.$el.toggleClass("active") }, - + + enterSubmit: function (e) { + e.stopPropagation() + var base = this + if (e.keyCode == 13) { + setTimeout(this.save.bind(this), 100) + } + }, + validate: function(){ var errors = [] var name = this.$name.val() @@ -52,15 +68,23 @@ var BuilderSettings = FormView.extend({ serialize: function(){ var fd = new FormData() - fd.append("name", this.$name.val()) - fd.append("new_name", this.$newName.val()) - fd.append("privacy", this.$privacy.val()) - fd.append("rooms", Rooms.serialize()) - fd.append("startPosition", app.position(scene.camera)) + fd.append( "_csrf", this.$csrf.val() ) + fd.append( "_id", this.$id.val() ) + fd.append( "name", this.$name.val() ) + fd.append( "privacy", this.$privacy.val() ) + fd.append( "rooms", JSON.stringify( Rooms.serialize() ) ) + fd.append( "startPosition", JSON.stringify( app.position(scene.camera) ) ) + fd.append( "thumbnail", dataUriToBlob(map.canvas.toDataURL()) ) return fd }, - success: function(){ + success: function(data){ + console.log(data) + this.$id.val(data._id) + this.$name.val(data.name) + this.action = this.updateAction + + window.history.pushState(null, document.title, "/builder/" + data.slug) }, }) diff --git a/public/assets/javascripts/ui/builder/BuilderView.js b/public/assets/javascripts/ui/builder/BuilderView.js index 9c0f236..33aface 100644 --- a/public/assets/javascripts/ui/builder/BuilderView.js +++ b/public/assets/javascripts/ui/builder/BuilderView.js @@ -14,11 +14,12 @@ var BuilderView = View.extend({ load: function(name){ if (! name || name == "new") { - this.isNew = true - this.ready({}) + this.ready({ isNew: true, _id: "new", name: "" }) return } - + + name = sanitize(name) + $.get(this.action + name, $.proxy(this.ready, this)) }, diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js index 2766a44..0a03878 100644 --- a/public/assets/javascripts/ui/site/LayoutsModal.js +++ b/public/assets/javascripts/ui/site/LayoutsModal.js @@ -1,21 +1,28 @@ var LayoutsIndex = View.extend({ - load: function(type){ - this.show() + initialize: function(){ + this.$templates = this.$(".templates") + }, + load: function(type){ + this.$templates.children("span").remove() + $.get("/api/layouts", $.proxy(function(data){ - console.log(data) + data.forEach($.proxy(function(room){ var $span = $("<span>") - $span.html(JSON.stringify(room)) - this.$(".templates").append($span) + // $span.html(JSON.stringify(room)) + $span.data("slug", room.slug) + $span.css("background-image", "url(" + room.photo + ")") + + this.$templates.append($span) }, this)) + this.show() }, this)) } - }) @@ -30,10 +37,11 @@ var LayoutsModal = ModalView.extend(LayoutsIndex.prototype).extend({ toggleActive: function(e){ e.preventDefault() this.$(".templates .active").removeClass("active") - $(e.currentTarget).addClass("active") + var $layout = $(e.currentTarget) + $layout.addClass("active") // actually do - // window.location.pathname = "/builder/" + $(this).data("name") + window.location.pathname = "/builder/" + $layout.data("slug") }, newBuilder: function(e){ @@ -44,7 +52,6 @@ var LayoutsModal = ModalView.extend(LayoutsIndex.prototype).extend({ }) - var NewProjectModal = ModalView.extend(LayoutsIndex.prototype).extend({ el: ".mediaDrawer.newProject", diff --git a/public/assets/javascripts/vendor/dataUriToBlob.js b/public/assets/javascripts/vendor/dataUriToBlob.js new file mode 100644 index 0000000..582aecb --- /dev/null +++ b/public/assets/javascripts/vendor/dataUriToBlob.js @@ -0,0 +1,47 @@ +window.dataUriToBlob = (function(){ +/** + * Blob constructor. + */ + +var Blob = window.Blob; + +/** + * ArrayBufferView support. + */ + +var hasArrayBufferView = new Blob([new Uint8Array(100)]).size == 100; + +/** + * Return a `Blob` for the given data `uri`. + * + * @param {String} uri + * @return {Blob} + * @api public + */ + +var dataUriToBlob = function(uri){ + var data = uri.split(',')[1]; + var bytes = atob(data); + var buf = new ArrayBuffer(bytes.length); + var arr = new Uint8Array(buf); + for (var i = 0; i < bytes.length; i++) { + arr[i] = bytes.charCodeAt(i); + } + + if (!hasArrayBufferView) arr = buf; + var blob = new Blob([arr], { type: mime(uri) }); + blob.slice = blob.slice || blob.webkitSlice; + return blob; +}; + +/** + * Return data uri mime type. + */ + +function mime(uri) { + return uri.split(';')[0].slice(5); +} + +return dataUriToBlob; + +})() diff --git a/public/assets/stylesheets/app.css b/public/assets/stylesheets/app.css index 582f627..0135573 100755 --- a/public/assets/stylesheets/app.css +++ b/public/assets/stylesheets/app.css @@ -1358,7 +1358,7 @@ form h3 { .errorList { font-weight: 300; } -.errors div, form .errors div { +.errors div, form .errors div, form .errorList div { float: none; } form li div div { |