change cesiumScriptRegex value

fixes Issue CesiumGS#8902
xiaobaogeit · Jun 5, 2020 · aa8b30a · aa8b30a
1 parent 1ae6836
commit aa8b30a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -260,3 +260,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
 - [Edvinas Pranka](https://github.com/epranka)
 - [James Bromwell](https://github.com/thw0rted)
 - [Brandon Nguyen](https://github.com/bn-dignitas)
+- [Wang Bao](https://github.com/xiaobaogeit)
diff --git a/Source/Core/buildModuleUrl.js b/Source/Core/buildModuleUrl.js
@@ -5,7 +5,7 @@ import Resource from "./Resource.js";
 
 /*global CESIUM_BASE_URL*/
 
-var cesiumScriptRegex = /((?:.*\/)|^)Cesium\.js$/;
+var cesiumScriptRegex = /((?:.*\/)|^)Cesium\.js(?:\W|$)/;
 function getBaseUrlFromCesiumScript() {
   var scripts = document.getElementsByTagName("script");
   for (var i = 0, len = scripts.length; i < len; ++i) {

diff --git a/Specs/Core/buildModuleUrlSpec.js b/Specs/Core/buildModuleUrlSpec.js
@@ -17,10 +17,15 @@ describe("Core/buildModuleUrl", function () {
     var r = buildModuleUrl._cesiumScriptRegex;
 
     expect(r.exec("Cesium.js")[1]).toEqual("");
+    expect(r.exec("Cesium.js?v=1.7")[1]).toEqual("");
     expect(r.exec("assets/foo/Cesium.js")[1]).toEqual("assets/foo/");
+    expect(r.exec("assets/foo/Cesium.js?v=1.7")[1]).toEqual("assets/foo/");
     expect(
       r.exec("http://example.invalid/Cesium/assets/foo/Cesium.js")[1]
     ).toEqual("http://example.invalid/Cesium/assets/foo/");
+    expect(
+      r.exec("http://example.invalid/Cesium/assets/foo/Cesium.js?v=1.7")[1]
+    ).toEqual("http://example.invalid/Cesium/assets/foo/");
 
     expect(r.exec("assets/foo/bar.cesium.js")).toBeNull();
   });