Skip to content

Commit 7a24b91

Browse files
committed
Merge branch 'main' into cesium.com
2 parents 16b28b4 + baaabaa commit 7a24b91

File tree

1,557 files changed

+44357
-54252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,557 files changed

+44357
-54252
lines changed

.github/actions/check-for-CLA/index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const getValuesFromGoogleSheet = async (sheetId, cellRanges) => {
4747
const checkIfIndividualCLAFound = async () => {
4848
const response = await getValuesFromGoogleSheet(
4949
GOOGLE_SHEETS_INFO.individualCLASheetId,
50-
"D2:D"
50+
"D2:D",
5151
);
5252

5353
const rows = response.data.values;
@@ -68,7 +68,7 @@ const checkIfIndividualCLAFound = async () => {
6868
const checkIfCorporateCLAFound = async () => {
6969
const response = await getValuesFromGoogleSheet(
7070
GOOGLE_SHEETS_INFO.corporateCLASheetId,
71-
"H2:H"
71+
"H2:H",
7272
);
7373

7474
const rows = response.data.values;
@@ -107,9 +107,9 @@ const getCommentBody = (hasSignedCLA, errorFoundOnCLACheck) => {
107107
const commentTemplate = fs.readFileSync(
108108
join(
109109
dirname(fileURLToPath(import.meta.url)),
110-
"templates/pullRequestComment.hbs"
110+
"templates/pullRequestComment.hbs",
111111
),
112-
"utf-8"
112+
"utf-8",
113113
);
114114

115115
const getCommentFromTemplate = Handlebars.compile(commentTemplate);
@@ -138,7 +138,7 @@ const postCommentOnPullRequest = async (hasSignedCLA, errorFoundOnCLACheck) => {
138138
accept: "application/vnd.github+json",
139139
"X-GitHub-Api-Version": "2022-11-28",
140140
},
141-
}
141+
},
142142
);
143143
};
144144

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,5 @@ Specs/jasmine/**
3838
Apps/Sandcastle/ThirdParty
3939
Tools/jsdoc/cesium_template/static/javascript/prism.js
4040
Tools/jsdoc/cesium_template/static/styles/prism.css
41+
**/LICENSE.md
4142

.prettierrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

.slackbot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ releaseSchedule:
66
- jjhembd, 8/1/2024
77
- jjspace, 9/1/2024
88
- ggetz, 10/1/2024
9-
- jjhembd, 11/1/2024
9+
- lukemckinstry, 11/1/2024
1010
- jjspace, 12/1/2024
1111

Apps/CesiumViewer/CesiumViewer.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ async function main() {
4747
let baseLayer;
4848
if (defined(endUserOptions.tmsImageryUrl)) {
4949
baseLayer = ImageryLayer.fromProviderAsync(
50-
TileMapServiceImageryProvider.fromUrl(endUserOptions.tmsImageryUrl)
50+
TileMapServiceImageryProvider.fromUrl(endUserOptions.tmsImageryUrl),
5151
);
5252
}
5353

@@ -222,11 +222,11 @@ async function main() {
222222
let hpr = "";
223223
if (defined(camera.heading)) {
224224
hpr = `,${CesiumMath.toDegrees(camera.heading)},${CesiumMath.toDegrees(
225-
camera.pitch
225+
camera.pitch,
226226
)},${CesiumMath.toDegrees(camera.roll)}`;
227227
}
228228
endUserOptions.view = `${CesiumMath.toDegrees(
229-
position.longitude
229+
position.longitude,
230230
)},${CesiumMath.toDegrees(position.latitude)},${position.height}${hpr}`;
231231
history.replaceState(undefined, "", `?${objectToQuery(endUserOptions)}`);
232232
}

Apps/CesiumViewer/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
33
<head>
44
<!-- Use correct character set. -->

Apps/HelloWorld.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
33
<head>
44
<!-- Use correct character set. -->

Apps/Sandcastle/CesiumSandcastle.js

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ require({
9494
dojoscript,
9595
LinkButton,
9696
ClipboardJS,
97-
pako
97+
pako,
9898
) {
9999
"use strict";
100100
// attach clipboard handling to our Copy button
@@ -237,7 +237,7 @@ require({
237237
function clearRun() {
238238
domClass.remove(
239239
registry.byId("buttonRun").domNode,
240-
"highlightToolbarButton"
240+
"highlightToolbarButton",
241241
);
242242
}
243243

@@ -339,8 +339,8 @@ require({
339339
function openGalleryTooltip() {
340340
galleryTooltipTimer = undefined;
341341

342-
const selectedTabName = registry.byId("innerPanel").selectedChildWidget
343-
.title;
342+
const selectedTabName =
343+
registry.byId("innerPanel").selectedChildWidget.title;
344344
let suffix = `${selectedTabName}Demos`;
345345
if (selectedTabName === "All") {
346346
suffix = "all";
@@ -398,7 +398,7 @@ require({
398398
line = jsEditor.setGutterMarker(
399399
i,
400400
"searchGutter",
401-
makeLineLabel(`Search: ${searchTerm}`, "searchMarker")
401+
makeLineLabel(`Search: ${searchTerm}`, "searchMarker"),
402402
);
403403
jsEditor.addLineClass(line, "text", "searchLine");
404404
errorLines.push(line);
@@ -418,7 +418,7 @@ require({
418418
line = jsEditor.setGutterMarker(
419419
scriptLineToEditorLine(hint.line),
420420
"hintGutter",
421-
makeLineLabel(hint.reason, "hintMarker")
421+
makeLineLabel(hint.reason, "hintMarker"),
422422
);
423423
jsEditor.addLineClass(line, "text", "hintLine");
424424
errorLines.push(line);
@@ -456,7 +456,7 @@ require({
456456
{
457457
line: lineNumber - 1,
458458
ch: 0,
459-
}
459+
},
460460
);
461461
jsEditor.focus();
462462
jsEditor.setSelection(
@@ -467,7 +467,7 @@ require({
467467
{
468468
line: lineNumber,
469469
ch: 0,
470-
}
470+
},
471471
);
472472
}
473473
}
@@ -484,7 +484,7 @@ require({
484484
line = jsEditor.setGutterMarker(
485485
lineNum,
486486
"highlightGutter",
487-
makeLineLabel("highlighted by demo", "highlightMarker")
487+
makeLineLabel("highlighted by demo", "highlightMarker"),
488488
);
489489
jsEditor.addLineClass(line, "text", "highlightLine");
490490
highlightLines.push(line);
@@ -519,7 +519,7 @@ require({
519519
demoContainer.scrollLeft -= (e.wheelDelta * 70) / 120;
520520
}
521521
},
522-
false
522+
false,
523523
);
524524
} else {
525525
demoContainer.addEventListener(
@@ -529,7 +529,7 @@ require({
529529
demoContainer.scrollLeft += (e.detail * 70) / 3;
530530
}
531531
},
532-
false
532+
false,
533533
);
534534
}
535535
}
@@ -575,7 +575,7 @@ require({
575575
Tab: "indentMore",
576576
"Shift-Tab": "indentLess",
577577
},
578-
}
578+
},
579579
);
580580

581581
window.onbeforeunload = function (e) {
@@ -629,7 +629,7 @@ require({
629629
appendConsole(
630630
"consoleError",
631631
"Make sure Cesium is built, see the Contributor's Guide for details.",
632-
true
632+
true,
633633
);
634634
}
635635
};
@@ -676,7 +676,7 @@ require({
676676

677677
element.textContent = embedInSandcastleTemplate(
678678
jsEditor.getValue(),
679-
isFirefox
679+
isFirefox,
680680
);
681681
bucketDoc.body.appendChild(element);
682682
}
@@ -700,7 +700,7 @@ require({
700700
appendConsole(
701701
"consoleError",
702702
`Error, first part of ${local.bucketName} must match first part of bucket.html exactly.`,
703-
true
703+
true,
704704
);
705705
} else {
706706
const bodyAttributes = local.headers.match(/<body([^>]*?)>/)[1];
@@ -722,7 +722,7 @@ require({
722722
const pos = local.headers.indexOf("</head>");
723723
const extraHeaders = local.headers.substring(
724724
local.emptyBucket.length,
725-
pos
725+
pos,
726726
);
727727
bucketDoc.head.innerHTML += extraHeaders;
728728
activateBucketScripts(bucketDoc);
@@ -831,7 +831,7 @@ require({
831831
appendConsole(
832832
"consoleError",
833833
`Unable to GET gist from GitHub API. This could be due to too many requests from your IP. Try again in an hour or copy and paste the code from the gist: https://gist.github.com/${queryObject.gist}`,
834-
true
834+
true,
835835
);
836836
console.log(error);
837837
});
@@ -854,13 +854,13 @@ require({
854854
const doc = parser.parseFromString(demo.code, "text/html");
855855

856856
const script = doc.querySelector(
857-
'script[id="cesium_sandcastle_script"]'
857+
'script[id="cesium_sandcastle_script"]',
858858
);
859859
if (!script) {
860860
appendConsole(
861861
"consoleError",
862862
`Error reading source file: ${demo.name}`,
863-
true
863+
true,
864864
);
865865
return;
866866
}
@@ -870,7 +870,7 @@ require({
870870
appendConsole(
871871
"consoleError",
872872
`Error reading source file: ${demo.name}`,
873-
true
873+
true,
874874
);
875875
return;
876876
}
@@ -906,7 +906,7 @@ require({
906906
document.title = `${e.state.name} - Cesium Sandcastle`;
907907
}
908908
},
909-
false
909+
false,
910910
);
911911

912912
window.addEventListener(
@@ -933,25 +933,25 @@ require({
933933
appendConsole(
934934
"consoleError",
935935
'Documentation not available. Please run the "build-docs" build script to generate Cesium documentation.',
936-
true
936+
true,
937937
);
938938
showGallery();
939939
}
940940
if (galleryError) {
941941
appendConsole(
942942
"consoleError",
943943
"Error loading gallery, please run the build script.",
944-
true
944+
true,
945945
);
946946
}
947947
if (deferredLoadError) {
948948
appendConsole(
949949
"consoleLog",
950950
`Unable to load demo named ${queryObject.src.replace(
951951
".html",
952-
""
952+
"",
953953
)}. Redirecting to HelloWorld.\n`,
954-
true
954+
true,
955955
);
956956
}
957957
}
@@ -973,7 +973,7 @@ require({
973973
line = jsEditor.setGutterMarker(
974974
lineNumber,
975975
"errorGutter",
976-
makeLineLabel(e.data.error, "errorMarker")
976+
makeLineLabel(e.data.error, "errorMarker"),
977977
);
978978
jsEditor.addLineClass(line, "text", "errorLine");
979979
errorLines.push(line);
@@ -989,7 +989,7 @@ require({
989989
highlightLine(e.data.highlight);
990990
}
991991
},
992-
true
992+
true,
993993
);
994994

995995
registry.byId("jsContainer").on("show", function () {
@@ -1064,7 +1064,7 @@ require({
10641064
// we save a few bytes by omitting the leading [" and trailing "] since they are always the same
10651065
jsonString = jsonString.substr(2, jsonString.length - 4);
10661066
let base64String = btoa(
1067-
pako.deflate(jsonString, { raw: true, to: "string", level: 9 })
1067+
pako.deflate(jsonString, { raw: true, to: "string", level: 9 }),
10681068
);
10691069
base64String = base64String.replace(/\=+$/, ""); // remove padding
10701070

@@ -1110,7 +1110,7 @@ require({
11101110
let confirmChange = true;
11111111
if (demoHtml !== htmlText || demoCode !== jsText) {
11121112
confirmChange = window.confirm(
1113-
"You have unsaved changes. Are you sure you want to navigate away from this demo?"
1113+
"You have unsaved changes. Are you sure you want to navigate away from this demo?",
11141114
);
11151115
}
11161116
if (confirmChange) {
@@ -1135,7 +1135,7 @@ require({
11351135
local.headers
11361136
}\n${htmlEditor.getValue()}<script id="cesium_sandcastle_script">\n${embedInSandcastleTemplate(
11371137
jsEditor.getValue(),
1138-
false
1138+
false,
11391139
)}</script>\n` +
11401140
`</body>\n` +
11411141
`</html>\n`
@@ -1146,20 +1146,20 @@ require({
11461146
let currentDemoName = queryObject.src;
11471147
currentDemoName = currentDemoName.replace(".html", "");
11481148
const description = encodeHTML(
1149-
registry.byId("description").get("value").replace(/\n/g, "\\n")
1149+
registry.byId("description").get("value").replace(/\n/g, "\\n"),
11501150
).replace(/\"/g, "&quot;");
11511151
const label = encodeHTML(
1152-
registry.byId("label").get("value").replace(/\n/g, "\\n")
1152+
registry.byId("label").get("value").replace(/\n/g, "\\n"),
11531153
).replace(/\"/g, "&quot;");
11541154

11551155
let html = getDemoHtml();
11561156
html = html.replace(
11571157
"<title>",
1158-
`<meta name="description" content="${description}">\n <title>`
1158+
`<meta name="description" content="${description}">\n <title>`,
11591159
);
11601160
html = html.replace(
11611161
"<title>",
1162-
`<meta name="cesium-sandcastle-labels" content="${label}">\n <title>`
1162+
`<meta name="cesium-sandcastle-labels" content="${label}">\n <title>`,
11631163
);
11641164

11651165
const octetBlob = new Blob([html], {
@@ -1245,7 +1245,7 @@ require({
12451245
demo.description = description ? description : "";
12461246

12471247
const labelsMeta = doc.querySelector(
1248-
'meta[name="cesium-sandcastle-labels"]'
1248+
'meta[name="cesium-sandcastle-labels"]',
12491249
);
12501250
const labels = labelsMeta && labelsMeta.getAttribute("content");
12511251
if (demo.isNew) {
@@ -1359,7 +1359,7 @@ require({
13591359
let confirmChange = true;
13601360
if (demoHtml !== htmlText || demoCode !== jsText) {
13611361
confirmChange = window.confirm(
1362-
"You have unsaved changes. Are you sure you want to navigate away from this demo?"
1362+
"You have unsaved changes. Are you sure you want to navigate away from this demo?",
13631363
);
13641364
}
13651365
if (confirmChange) {

0 commit comments

Comments
 (0)