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

Modifying the loader script to check more carefully for the location of OpenLayers.js - allowing folks to have scripts called things like foo-OpenLayers.js. r=crschmidt (closes #1888)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@9086 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Tim Schaub
2009-03-18 15:57:41 +00:00
parent 6708f691e2
commit eb03ccc02d
2 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers.js
+5 -11
View File
@@ -38,27 +38,21 @@
*/ */
_getScriptLocation: function () { _getScriptLocation: function () {
var scriptLocation = ""; var scriptLocation = "";
var scriptName = OpenLayers._scriptName; var isOL = new RegExp("(^|(.*?\\/))(" + OpenLayers._scriptName + ")(\\?|$)");
var scripts = document.getElementsByTagName('script'); var scripts = document.getElementsByTagName('script');
for (var i=0, len=scripts.length; i<len; i++) { for (var i=0, len=scripts.length; i<len; i++) {
var src = scripts[i].getAttribute('src'); var src = scripts[i].getAttribute('src');
if (src) { if (src) {
var index = src.lastIndexOf(scriptName); var match = src.match(isOL);
// set path length for src up to a query string if(match) {
var pathLength = src.lastIndexOf('?'); scriptLocation = match[1];
if (pathLength < 0) {
pathLength = src.length;
}
// is it found, at the end of the URL?
if ((index > -1) && (index + scriptName.length == pathLength)) {
scriptLocation = src.slice(0, pathLength - scriptName.length);
break; break;
} }
} }
} }
return scriptLocation; return scriptLocation;
} }
}; };
/** /**
* OpenLayers.singleFile is a flag indicating this file is being included * OpenLayers.singleFile is a flag indicating this file is being included
tests/OpenLayers.html
+15 -10
View File
@@ -1,19 +1,24 @@
<html> <html>
<head> <head>
<script id="script" src="../lib/OpenLayers.js"></script> <script src="bogus/1/OpenLayers.js-foo"></script>
<script type="text/javascript"> <script src="bogus/2/foo-OpenLayers.js"></script>
function test_OpenLayers(t) { <script id="script" src="../lib/OpenLayers.js"></script>
t.plan(2); <script type="text/javascript">
function test_OpenLayers(t) {
t.plan(3);
var script = document.getElementById("script"); var script = document.getElementById("script");
t.eq(OpenLayers._getScriptLocation(), "../", "Script location correctly detected."); t.eq(OpenLayers._getScriptLocation(), "../", "Script location correctly detected.");
script.setAttribute("src", "../lib/OpenLayers.js?foo");
t.eq(OpenLayers._getScriptLocation(), "../", "Script location with search string correctly detected.");
script.setAttribute("src", "../lib/OpenLayers.js?foo"); // now pretend we're using a built script
t.eq(OpenLayers._getScriptLocation(), "../", "Script location with search string correctly detected."); OpenLayers._scriptName = "OpenLayers.js";
} t.eq(OpenLayers._getScriptLocation(), "../lib/", "not fooled by bogus paths");
</script> }
</script>
</head> </head>
<body> <body>
</body> </body>