Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change cesiumScriptRegex value #8918

Merged
merged 4 commits into from
Jun 8, 2020
Merged

change cesiumScriptRegex value #8918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa8b30a
change cesiumScriptRegex value
xiaobaogeit Jun 5, 2020
e529cef
add more test
xiaobaogeit Jun 6, 2020
661342c
Improve base url regex, add additional test.
mramato Jun 8, 2020
cd781ef
Merge branch 'master' into cesiumScriptRegex
mramato Jun 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,4 +262,5 @@ 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)
- [John Remsberg](https://github.com/easternmotors)
2 changes: 1 addition & 1 deletion Source/Core/buildModuleUrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Resource from "./Resource.js";

/*global CESIUM_BASE_URL*/

var cesiumScriptRegex = /((?:.*\/)|^)Cesium\.js$/;
var cesiumScriptRegex = /((?:.*\/)|^)Cesium\.js(?:\?|\#|$)/;
function getBaseUrlFromCesiumScript() {
var scripts = document.getElementsByTagName("script");
for (var i = 0, len = scripts.length; i < len; ++i) {
Expand Down
13 changes: 13 additions & 0 deletions Specs/Core/buildModuleUrlSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,25 @@ 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("cesium.js")).toBeNull();
expect(r.exec("Cesium.js%20")).toBeNull();
expect(r.exec("Cesium.min.js")).toBeNull();
expect(r.exec("CesiumSomething.js")).toBeNull();
expect(r.exec("CesiumSomething.js?v=1.7")).toBeNull();
expect(r.exec("assets/foo/bar.cesium.js")).toBeNull();
expect(r.exec("assets/foo/bar.cesium.js?v=1.7")).toBeNull();
expect(r.exec("assets/foo/CesiumSomething.js")).toBeNull();
expect(r.exec("assets/foo/CesiumSomething.js?v=1.7")).toBeNull();
});

it("CESIUM_BASE_URL works with trailing slash", function () {
Expand Down