summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/rectangles
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2014-06-06 17:29:50 -0400
committerJules Laplace <jules@okfoc.us>2014-06-06 17:29:50 -0400
commitfdac6c79935fa9b773cbb9d4a0c2499726764777 (patch)
tree8457a6d7abf1b5dedcadb1a7021aac9b2d6e7446 /public/assets/javascripts/rectangles
parent8f12d34393708ab2ec03a5ad44bc83bc86f16dc9 (diff)
creating new users with email and password
Diffstat (limited to 'public/assets/javascripts/rectangles')
-rw-r--r--public/assets/javascripts/rectangles/engine/map/_map.js3
-rw-r--r--public/assets/javascripts/rectangles/engine/map/ui.js2
-rw-r--r--public/assets/javascripts/rectangles/util/colors.js4
3 files changed, 7 insertions, 2 deletions
diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index 53084bb..967e28b 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -6,6 +6,9 @@ window.ctx = window.w = window.h = null;
var map = new function(){
var base = this
base.el = document.querySelector("#map")
+
+ if (! base.el) return
+
base.dimensions = new vec2(500,500)
base.bounds = new vec2(500,500)
base.center = new vec2(0,0)
diff --git a/public/assets/javascripts/rectangles/engine/map/ui.js b/public/assets/javascripts/rectangles/engine/map/ui.js
index 6e9a5ab..2e40cad 100644
--- a/public/assets/javascripts/rectangles/engine/map/ui.js
+++ b/public/assets/javascripts/rectangles/engine/map/ui.js
@@ -2,6 +2,8 @@
map.ui = new function(){
var base = this
+
+ if (! base.el) return
base.creating = base.dragging = base.resizing = false
diff --git a/public/assets/javascripts/rectangles/util/colors.js b/public/assets/javascripts/rectangles/util/colors.js
index e8e60d0..d970b0b 100644
--- a/public/assets/javascripts/rectangles/util/colors.js
+++ b/public/assets/javascripts/rectangles/util/colors.js
@@ -42,7 +42,7 @@
}
var select = document.querySelector("#palette")
- select.addEventListener("change", function(){
+ select && select.addEventListener("change", function(){
colors = color_palettes[select.value]
Rooms.list.forEach(function(room){
room.walls.forEach(function(wall){
@@ -52,6 +52,6 @@
select.blur()
})
- window.colors = color_palettes[select.value]
+ window.colors = color_palettes[select ? select.value : 'bone']
window.palettes = color_palettes
})()