fix resize issues

1 files changed, 17 insertions, 12 deletions

diff --git a/public/assets/javascripts/rectangles/engine/map/_map.js b/public/assets/javascripts/rectangles/engine/map/_map.js
index 6492db6..ba3ec92 100644
--- a/public/assets/javascripts/rectangles/engine/map/_map.js
+++ b/public/assets/javascripts/rectangles/engine/map/_map.js
@@ -41,12 +41,28 @@ var Map = function(opt){
 	}
 	base.set_zoom(opt.zoom)
 
+	base.resize = function(w, h){
+	  if (w && h) {
+      canvas.width = base.dimensions.a = w
+      canvas.height = base.dimensions.b = h
+	  }
+	  else {
+      // resize here - esp if 2d-hires
+      canvas.width = base.dimensions.a = base.el.parentNode.offsetWidth
+      canvas.height = base.dimensions.b = base.el.parentNode.offsetHeight
+	  }
+	}
+		
+	base.toggle = function(state){
+		return $(base.el).toggle(state).is(':visible')
+	}
+
 	var canvas = base.canvas = document.createElement("canvas")
 	canvas.width = base.dimensions.a
 	canvas.height = base.dimensions.b
 
 	base.el.appendChild(canvas)
-	
+
 	switch (opt.type) {
 		case "ortho":
 			base.draw = new Map.Draw (base, { ortho: true })
@@ -71,17 +87,6 @@ var Map = function(opt){
 			base.sides = base.sides_for_camera
 			break
 	}
-	
-	base.resize = function(w, h){
-		canvas.width = base.dimensions.a = w || window.innerWidth
-		canvas.height = base.dimensions.b = h || window.innerHeight
-		// resize here - esp if 2d-hires
-	}
-		
-	base.toggle = function(state){
-		return $(base.el).toggle(state).is(':visible')
-	}
-
 }
 
 Map.prototype.update = function(){