summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-09-30 13:18:45 -0400
committerJules Laplace <jules@okfoc.us>2014-09-30 13:18:45 -0400
commitc32a6ff52628fbe0a530b4f72fc907a2ef651127 (patch)
tree1f61f098e7fc6d7f10209abc6ff0013abd1c9938
parent385dc017b65cbd7cd94b16e86a8368320d4274ea (diff)
fixing points not moving bug
-rw-r--r--public/assets/javascripts/rectangles/engine/scenery/resize.js2
-rw-r--r--public/assets/javascripts/rectangles/models/wall.js2
-rw-r--r--public/assets/javascripts/rectangles/util/permissions.js2
-rw-r--r--public/assets/javascripts/ui/editor/EditorToolbar.js12
-rw-r--r--public/assets/javascripts/ui/site/LayoutsModal.js1
5 files changed, 9 insertions, 10 deletions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index 96817c2..2ba84a1 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -147,7 +147,7 @@ Scenery.resize = new function(){
function down (e, cursor){
var selection = dots.filter(function(dot){return e.target == dot.el})
if (! selection.length) return
-
+
selected_dot = selection[0]
dragging = true
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 2bfb258..1b37aa0 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -64,7 +64,7 @@
e.stopPropagation()
return
}
-
+
app.controller.toolbar.resetPermissions()
Scenery.resize.show(scenery)
Scenery.hovering = true
diff --git a/public/assets/javascripts/rectangles/util/permissions.js b/public/assets/javascripts/rectangles/util/permissions.js
index 1b5a1b5..9e3ef4d 100644
--- a/public/assets/javascripts/rectangles/util/permissions.js
+++ b/public/assets/javascripts/rectangles/util/permissions.js
@@ -31,7 +31,7 @@ Permissions.prototype.add = function (key) {
Permissions.prototype.remove = function (key) {
var base = this
- base[key] = true
+ base[key] = false
}
Permissions.prototype.clear = function () {
diff --git a/public/assets/javascripts/ui/editor/EditorToolbar.js b/public/assets/javascripts/ui/editor/EditorToolbar.js
index ec6bb46..9f439c8 100644
--- a/public/assets/javascripts/ui/editor/EditorToolbar.js
+++ b/public/assets/javascripts/ui/editor/EditorToolbar.js
@@ -41,8 +41,8 @@ var EditorToolbar = View.extend({
resetMode: function(){
// this.resizeMedia(true)
this.destroyMedia(false)
- app.controller.hideExtras()
- base.resetPermissions()
+ this.parent.hideExtras()
+ this.resetPermissions()
},
resetControls: function(){
@@ -53,10 +53,10 @@ var EditorToolbar = View.extend({
},
resetPermissions: function(){
- editor.permissions.assign("pick", true)
- editor.permissions.assign("move", true)
- editor.permissions.assign("resize", true)
- editor.permissions.assign("destroy", false)
+ editor.permissions.add("pick")
+ editor.permissions.add("move")
+ editor.permissions.add("resize")
+ editor.permissions.remove("destroy")
},
// resizeMedia: function(e, state){
diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index 2449465..1bfc6cb 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -29,7 +29,6 @@ var LayoutsIndex = View.extend({
this.$templates.append($span)
}.bind(this))
- console.log(this.$templates.html())
this.show()
}