Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13718 from jherico/fix/fb15963

Browse source 
Support rendering of 'about' URLs in web entities
This commit is contained in:
Seth Alves 2018-07-31 09:44:31 -07:00 committed by GitHub
commit 4ff9252b47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
View file

@ -53,7 +53,8 @@ WebEntityRenderer::ContentType WebEntityRenderer::getContentType(const QString&
} }
const QUrl url(urlString); const QUrl url(urlString);
if (url.scheme() == URL_SCHEME_HTTP || url.scheme() == URL_SCHEME_HTTPS || auto scheme = url.scheme();
if (scheme == URL_SCHEME_ABOUT || scheme == URL_SCHEME_HTTP || scheme == URL_SCHEME_HTTPS ||
urlString.toLower().endsWith(".htm") || urlString.toLower().endsWith(".html")) { urlString.toLower().endsWith(".htm") || urlString.toLower().endsWith(".html")) {
return ContentType::HtmlContent; return ContentType::HtmlContent;
} }

1
libraries/networking/src/NetworkingConstants.h
View file

@ -30,6 +30,7 @@ namespace NetworkingConstants {
QUrl METAVERSE_SERVER_URL(); QUrl METAVERSE_SERVER_URL();
} }
const QString URL_SCHEME_ABOUT = "about";
const QString URL_SCHEME_HIFI = "hifi"; const QString URL_SCHEME_HIFI = "hifi";
const QString URL_SCHEME_QRC = "qrc"; const QString URL_SCHEME_QRC = "qrc";
const QString URL_SCHEME_FILE = "file"; const QString URL_SCHEME_FILE = "file";