ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #390 from elemoine/scriptlocation

Browse Source 
_getScriptLocation regexp not robust enough
This commit is contained in:
Éric Lemoine
2012-04-04 21:43:08 -07:00
parent 0554637c56 b1b4736315
commit 685eae7c04
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/OpenLayers/SingleFile.js
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++) {

4
tests/SingleFile1.html
View File

@@ -1,11 +1,11 @@
<html>
<head>
<script src="some/path/OpenLayers.js"></script>
<script src="some/OpenLayers/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/",
t.eq(OpenLayers._getScriptLocation(), "some/OpenLayers/path/",
"Script location correctly detected (OpenLayers.js).");
}
</script>

4
tests/SingleFile2.html
View File

@@ -1,11 +1,11 @@
<html>
<head>
<script src="some/path/OpenLayers.light.js"></script>
<script src="some/OpenLayers/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/",
t.eq(OpenLayers._getScriptLocation(), "some/OpenLayers/path/",
"Script location correctly detected (OpenLayers.light.js)<29>.");
}
</script>

4
tests/SingleFile3.html
View File

@@ -1,11 +1,11 @@
<html>
<head>
<script src="some/path/OpenLayers.light.debug.js"></script>
<script src="some/OpenLayers/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/",
t.eq(OpenLayers._getScriptLocation(), "some/OpenLayers/path/",
"Script location correctly detected (OpenLayers.light.debug.js).");
}
</script>