improve debug handling

CloudMade · Jun 2, 2011 · 3488f88 · 3488f88
1 parent 4e344bd
commit 3488f88
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 14 deletions.
diff --git a/debug/include.js → debug/leaflet-include.js b/debug/include.js → debug/leaflet-include.js
@@ -74,9 +74,20 @@
 		'map/ext/Map.Control.js'
 	];
 
-	var scriptTags = document.getElementsByTagName('script');
-	// Last script tag inserted/evaluated "should" be include.js
-	var path = scriptTags[scriptTags.length - 1].src.split('include.js')[0];
+	function getSrcUrl() {
+		var scripts = document.getElementsByTagName('script');
+		for (var i = 0; i < scripts.length; i++) {
+			var src = scripts[i].src;
+			if (src) {
+				var res = src.match(/^(.*)leaflet-include\.js$/);
+				if (res.length) {
+					return res[1] + '../src/';
+				}
+			}
+		}
+	}
+
+	var path = getSrcUrl();
 	for (var i = 0; i < scripts.length; i++) {
 		document.writeln("<script type='text/javascript' src='" + path + "../src/" + scripts[i] + "'></script>");
 	}

diff --git a/debug/map/canvas.html b/debug/map/canvas.html
@@ -8,7 +8,7 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../include.js"></script>
+	<script src="../leaflet-include.js"></script>
 </head>
 <body>
 

diff --git a/debug/map/map-mobile.html b/debug/map/map-mobile.html
@@ -10,7 +10,7 @@
 
 	<link rel="stylesheet" href="../css/mobile.css" />
 
-	<script src="../include.js"></script>
+	<script src="../leaflet-include.js"></script>
 </head>
 <body>
 

diff --git a/debug/map/map.html b/debug/map/map.html
@@ -8,7 +8,7 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../include.js"></script>
+	<script src="../leaflet-include.js"></script>
 </head>
 <body>
 

diff --git a/debug/map/wms-marble.html b/debug/map/wms-marble.html
@@ -8,7 +8,7 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../include.js"></script>
+	<script src="../leaflet-include.js"></script>
 </head>
 <body>
 

diff --git a/debug/map/wms.html b/debug/map/wms.html
@@ -8,7 +8,7 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../include.js"></script>
+	<script src="../leaflet-include.js"></script>
 </head>
 <body>
 

diff --git a/debug/vector/vector-mobile.html b/debug/vector/vector-mobile.html
@@ -10,7 +10,7 @@
 
 	<link rel="stylesheet" href="../css/mobile.css" />
 
-	<script src="../include.js"></script>
+	<script src="../leaflet-include.js"></script>
 </head>
 <body>
 	<div id="map"></div>

diff --git a/debug/vector/vector.html b/debug/vector/vector.html
@@ -8,7 +8,7 @@
 
 	<link rel="stylesheet" href="../css/screen.css" />
 
-	<script src="../include.js"></script>
+	<script src="../leaflet-include.js"></script>
 </head>
 <body>
 	<div id="map" style="width: 800px; height: 600px; border: 1px solid #ccc"></div>

diff --git a/dist/leaflet.js b/dist/leaflet.js
diff --git a/src/Leaflet.js b/src/Leaflet.js
@@ -8,11 +8,16 @@ var L = {
 	VERSION: '0.2',
 
 	ROOT_URL: (function() {
-		var scripts = document.getElementsByTagName('script');
+		var scripts = document.getElementsByTagName('script'),
+			leafletRe = /^(.*\/)leaflet-?([\w-]*)\.js.*$/;
 		for (var i = 0, len = scripts.length; i < len; i++) {
 			var src = scripts[i].src,
-				res = src && src.match(/^(.*\/)leaflet-*\w*\.js.*$/);
-			if (res && res[1]) { return res[1]; }
+				res = src && src.match(leafletRe);
+
+			if (res) {
+				if (res[2] == 'include') break;
+				return res[1];
+			}
 		}
 		return '../../dist/';
 	})(),