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

Cesium ion logo - support for data URL scheme #9085

Merged
merged 9 commits into from
Aug 10, 2020
Merged

Cesium ion logo - support for data URL scheme #9085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2d871cd
Merge tag '1.48'
kring Aug 21, 2018
bdab4cd
Added extra info to README about branches, Terria
KeyboardSounds Jul 26, 2019
5bf7466
Merge pull request #50 from TerriaJS/update-readme
soyarsauce Jul 26, 2019
c46d039
fixed typo in readme
KeyboardSounds Jul 29, 2019
e7387a3
Revert TerriaJS README changes
reginapramesti Aug 6, 2020
12d1e67
Merge branch 'master' of github.com:CesiumGS/cesium into ion-logo-fix
reginapramesti Aug 6, 2020
f698c90
Check for data scheme in cesium ion logo URL
reginapramesti Aug 6, 2020
f926a8c
Update contributors docs
reginapramesti Aug 6, 2020
370d388
Update CHANGES.md
reginapramesti Aug 6, 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 CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
##### Fixes :wrench:

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

### 1.72 - 2020-08-03

Expand Down
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 @@ -59,6 +59,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
- [Emma Krantz](https://github.com/KeyboardSounds)
- [Stephen Davies](https://github.com/steve9164)
- [Rowan Winsemius](https://github.com/rowanwins)
- [Regina Pramesti](https://github.com/reginapramesti)
- [EU Edge](http://euedge.com/)
- [Ákos Maróy](https://github.com/akosmaroy)
- [Raytheon Intelligence and Information Systems](http://www.raytheon.com/)
Expand Down
6 changes: 5 additions & 1 deletion Source/Scene/CreditDisplay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,11 @@ function getDefaultCredit() {

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