Merge pull request #2 from elemoine/multiple-builds

Matt Priour · Matt Priour · commit 9e90af914dfc · 2012-03-12T06:20:28.000-07:00
Multiple builds
diff --git a/lib/OpenLayers/SingleFile.js b/lib/OpenLayers/SingleFile.js
@@ -25,7 +25,7 @@ var OpenLayers = {
      * {String} Path to this script
      */
     _getScriptLocation: (function() {
-        var r = new RegExp("(^|(.*?\\/))(OpenLayers.*?\.js)(\\?|$)"),
+        var r = new RegExp("(^|(.*?\\/))(OpenLayers.*?\\.js)(\\?|$)"),
             s = document.getElementsByTagName('script'),
             src, m, l = "";
         for(var i=0, len=s.length; i<len; i++) {
diff --git a/tests/SingleFile1.html b/tests/SingleFile1.html
@@ -0,0 +1,15 @@
+<html>
+<head>
+    <script src="some/path/OpenLayers.js"></script>
+    <script src="../lib/OpenLayers/SingleFile.js"></script>
+    <script type="text/javascript">
+        function test_OpenLayers(t) {
+            t.plan(1);
+            t.eq(OpenLayers._getScriptLocation(), "some/path/",
+                 "Script location correctly detected (OpenLayers.js).");
+        }
+    </script>
+</head>
+<body>
+</body>
+</html>
diff --git a/tests/SingleFile2.html b/tests/SingleFile2.html
@@ -0,0 +1,15 @@
+<html>
+<head>
+    <script src="some/path/OpenLayers.light.js"></script>
+    <script src="../lib/OpenLayers/SingleFile.js"></script>
+    <script type="text/javascript">
+        function test_OpenLayers(t) {
+            t.plan(1);
+            t.eq(OpenLayers._getScriptLocation(), "some/path/",
+                 "Script location correctly detected (OpenLayers.light.js)�.");
+        }
+    </script>
+</head>
+<body>
+</body>
+</html>
diff --git a/tests/SingleFile3.html b/tests/SingleFile3.html
@@ -0,0 +1,15 @@
+<html>
+<head>
+    <script src="some/path/OpenLayers.light.debug.js"></script>
+    <script src="../lib/OpenLayers/SingleFile.js"></script>
+    <script type="text/javascript">
+        function test_OpenLayers(t) {
+            t.plan(1);
+            t.eq(OpenLayers._getScriptLocation(), "some/path/",
+                 "Script location correctly detected (OpenLayers.light.debug.js).");
+        }
+    </script>
+</head>
+<body>
+</body>
+</html>
diff --git a/tests/list-tests.html b/tests/list-tests.html
@@ -182,6 +182,9 @@
     <li>OpenLayers3.html</li>
     <li>OpenLayers4.html</li>
     <li>OpenLayersJsFiles.html</li>
+    <li>SingleFile1.html</html>
+    <li>SingleFile2.html</html>
+    <li>SingleFile3.html</html>
     <li>Popup.html</li>
     <li>Popup/Anchored.html</li>
     <li>Popup/AnchoredBubble.html</li>
