From b1b47363154874e5d6cff2d89f00dfb789ecc36d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Wed, 4 Apr 2012 20:30:50 +0200 Subject: [PATCH] make _getScriptLocation RegExp more robust, p=jpfiset, t,r=me --- lib/OpenLayers/SingleFile.js | 2 +- tests/SingleFile1.html | 4 ++-- tests/SingleFile2.html | 4 ++-- tests/SingleFile3.html | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/OpenLayers/SingleFile.js b/lib/OpenLayers/SingleFile.js index eeda78eef0..6bd4cb8e0f 100644 --- 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 - + diff --git a/tests/SingleFile2.html b/tests/SingleFile2.html index 5fc9248058..68b47a3f9b 100644 --- a/tests/SingleFile2.html +++ b/tests/SingleFile2.html @@ -1,11 +1,11 @@ - + diff --git a/tests/SingleFile3.html b/tests/SingleFile3.html index 557952c233..bb58fcbde8 100644 --- a/tests/SingleFile3.html +++ b/tests/SingleFile3.html @@ -1,11 +1,11 @@ - +