Skip to content

Commit 2fc3042

Browse files
author
Omar Shehata
authored
Merge pull request #9085 from TerriaJS/ion-logo-fix
Cesium ion logo - support for data URL scheme
2 parents 9b2e80b + 370d388 commit 2fc3042

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

CHANGES.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
##### Fixes :wrench:
66

77
- Fixed several artifcats on mobile devices caused by using insufficient precision. [#9064](https://github.com/CesiumGS/cesium/pull/9064)
8+
- Fixed handling of `data:` scheme for the Cesium ion logo URL. [#9085](https://github.com/CesiumGS/cesium/pull/9085)
89

910
### 1.72 - 2020-08-03
1011

CONTRIBUTORS.md

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
5959
- [Emma Krantz](https://github.com/KeyboardSounds)
6060
- [Stephen Davies](https://github.com/steve9164)
6161
- [Rowan Winsemius](https://github.com/rowanwins)
62+
- [Regina Pramesti](https://github.com/reginapramesti)
6263
- [EU Edge](http://euedge.com/)
6364
- [Ákos Maróy](https://github.com/akosmaroy)
6465
- [Raytheon Intelligence and Information Systems](http://www.raytheon.com/)

Source/Scene/CreditDisplay.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,11 @@ function getDefaultCredit() {
516516

517517
// When hosting in a WebView, the base URL scheme is file:// or ms-appx-web://
518518
// which is stripped out from the Credit's <img> tag; use the full path instead
519-
if (logo.indexOf("http://") !== 0 && logo.indexOf("https://") !== 0) {
519+
if (
520+
logo.indexOf("http://") !== 0 &&
521+
logo.indexOf("https://") !== 0 &&
522+
logo.indexOf("data:") !== 0
523+
) {
520524
var logoUrl = new Uri(logo);
521525
logo = logoUrl.getPath();
522526
}

0 commit comments

Comments
 (0)