Merge pull request #288 from mpriour/multiple-builds

Make the getScriptLocation function work with mobile & light builds
This commit is contained in:
Éric Lemoine
2012-03-12 07:19:42 -07:00
5 changed files with 49 additions and 1 deletions

View File

@@ -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++) {

15
tests/SingleFile1.html Normal file
View File

@@ -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>

15
tests/SingleFile2.html Normal file
View File

@@ -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)<29>.");
}
</script>
</head>
<body>
</body>
</html>

15
tests/SingleFile3.html Normal file
View File

@@ -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>

View File

@@ -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>