From 054c81263351d02a3cea33339d850bb0ecfb363f Mon Sep 17 00:00:00 2001
From: BlueRaja <BlueRaja.admin@gmail.com>
Date: Fri, 8 Mar 2013 05:04:00 -0600
Subject: Fix width issue when displaying maps

---
 js/mapspecs.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'js')

diff --git a/js/mapspecs.js b/js/mapspecs.js
index 7c74a92..3e649fd 100644
--- a/js/mapspecs.js
+++ b/js/mapspecs.js
@@ -850,8 +850,18 @@ function mapAsHTML(map, targetWidth, mapEditor) {
 	//console.log("MapObj", map);
 	mapdata[map.ID] = map;
 	
-	if ((map.width * 35) <= targetWidth) targetWidth = (map.width * 35);
-	if (!targetWidth) targetWidth = (map.width * 35);
+	if (!targetWidth || (map.width * 35) <= targetWidth)
+	{
+		targetWidth = (map.width * 35);
+	}
+	else
+	{
+		//Need to take into account padding of .grid_outer
+		var fakeGridDom = $('<div class="grid_outer"></div>');
+		var gridOuterPadding = parseInt(fakeGridDom.css('padding-left')) + parseInt(fakeGridDom.css('padding-right'));
+		targetWidth -= gridOuterPadding;
+	}
+	
 	var scale = map.width / targetWidth;
 	//alert(scale);
 	
-- 
cgit v1.2.3