summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/rectangles
diff options
context:
space:
mode:
Diffstat (limited to 'public/assets/javascripts/rectangles')
-rw-r--r--public/assets/javascripts/rectangles/engine/scenery/resize.js2
-rw-r--r--public/assets/javascripts/rectangles/models/wall.js5
-rw-r--r--public/assets/javascripts/rectangles/util/minotaur.js2
3 files changed, 5 insertions, 4 deletions
diff --git a/public/assets/javascripts/rectangles/engine/scenery/resize.js b/public/assets/javascripts/rectangles/engine/scenery/resize.js
index ca77525..96817c2 100644
--- a/public/assets/javascripts/rectangles/engine/scenery/resize.js
+++ b/public/assets/javascripts/rectangles/engine/scenery/resize.js
@@ -122,7 +122,7 @@ Scenery.resize = new function(){
Scenery.mouse.bind_el(dot.el)
$(dot.el).bind({
mouseenter: function(e){
- Scenery.resize.hovering = true
+// Scenery.resize.hovering = true
},
mouseleave: function(e){
// Scenery.resize.hovering = false
diff --git a/public/assets/javascripts/rectangles/models/wall.js b/public/assets/javascripts/rectangles/models/wall.js
index 5513a9b..2bfb258 100644
--- a/public/assets/javascripts/rectangles/models/wall.js
+++ b/public/assets/javascripts/rectangles/models/wall.js
@@ -64,9 +64,10 @@
e.stopPropagation()
return
}
-
+
+ app.controller.toolbar.resetPermissions()
Scenery.resize.show(scenery)
- Scenery.hovering = true
+ Scenery.hovering = true
UndoStack.push({
type: 'create-scenery',
diff --git a/public/assets/javascripts/rectangles/util/minotaur.js b/public/assets/javascripts/rectangles/util/minotaur.js
index 0fcc766..4d9a795 100644
--- a/public/assets/javascripts/rectangles/util/minotaur.js
+++ b/public/assets/javascripts/rectangles/util/minotaur.js
@@ -4,7 +4,7 @@
var base = this
base.$el = $("#minotaur")
base.timeout = null
- base.delay = 1000
+ base.delay = 5000
base.objects = {}
base.init = function () {