From fdac6c79935fa9b773cbb9d4a0c2499726764777 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 6 Jun 2014 17:29:50 -0400 Subject: creating new users with email and password --- public/assets/javascripts/rectangles/engine/map/_map.js | 3 +++ public/assets/javascripts/rectangles/engine/map/ui.js | 2 ++ public/assets/javascripts/rectangles/util/colors.js | 4 ++-- 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'public/assets/javascripts/rectangles') 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 })() -- cgit v1.2.3-70-g09d2