Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 00:10:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Missed tons of spots!

Browse source
This commit is contained in:
Zach Fox 2017-10-24 14:30:47 -07:00
parent b092862b03
commit 7998984d8e
11 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/dialogs/preferences/AvatarBrowser.qml
View file

@ -33,7 +33,7 @@ Window {
BaseWebView { BaseWebView {
id: webview id: webview
url: "https://metaverse.highfidelity.com/marketplace?category=avatars" url: Account.metaverseServerURL + "/marketplace?category=avatars"
focus: true focus: true
anchors { anchors {

2
interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
View file

@ -25,7 +25,7 @@ Item {
HifiConstants { id: hifi; } HifiConstants { id: hifi; }
id: root; id: root;
property string referrerURL: "https://metaverse.highfidelity.com/marketplace?"; property string referrerURL: (Account.metaverseServerURL + "/marketplace?");
readonly property int additionalDropdownHeight: usernameDropdown.height - myUsernameButton.anchors.bottomMargin; readonly property int additionalDropdownHeight: usernameDropdown.height - myUsernameButton.anchors.bottomMargin;
property alias usernameDropdownVisible: usernameDropdown.visible; property alias usernameDropdownVisible: usernameDropdown.visible;

2
interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletAvatarBrowser.qml
View file

@ -31,7 +31,7 @@ Item {
BaseWebView { BaseWebView {
id: webview id: webview
url: "https://metaverse.highfidelity.com/marketplace?category=avatars" url: (Account.metaverseServerURL + "/marketplace?category=avatars)"
focus: true focus: true
anchors { anchors {

4
libraries/ui/src/ui/types/RequestFilters.cpp
View file

@ -19,13 +19,13 @@
namespace { namespace {
bool isAuthableHighFidelityURL(const QUrl& url) { bool isAuthableHighFidelityURL(const QUrl& url) {
auto metaverseServerURL = DependencyManager::get<AccountManager>()->getMetaverseServerURL();
static const QStringList HF_HOSTS = { static const QStringList HF_HOSTS = {
"highfidelity.com", "highfidelity.io", "highfidelity.com", "highfidelity.io",
"metaverse.highfidelity.com", "metaverse.highfidelity.io" metaverseServerURL.toString(), "metaverse.highfidelity.io"
}; };
const auto& scheme = url.scheme(); const auto& scheme = url.scheme();
const auto& host = url.host(); const auto& host = url.host();
auto metaverseServerURL = DependencyManager::get<AccountManager>()->getMetaverseServerURL();
return (scheme == "https" && HF_HOSTS.contains(host)) || return (scheme == "https" && HF_HOSTS.contains(host)) ||
((scheme == metaverseServerURL.scheme()) && (host == metaverseServerURL.host())); ((scheme == metaverseServerURL.scheme()) && (host == metaverseServerURL.host()));

2
scripts/system/commerce/wallet.js
View file

@ -16,7 +16,7 @@
(function () { // BEGIN LOCAL_SCOPE (function () { // BEGIN LOCAL_SCOPE
Script.include("/~/system/libraries/accountUtils.js"); Script.include("/~/system/libraries/accountUtils.js");
var MARKETPLACE_URL = "https://metaverse.highfidelity.com/marketplace"; var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace";
// Function Name: onButtonClicked() // Function Name: onButtonClicked()
// //

2
scripts/system/directory.js
View file

@ -15,7 +15,7 @@ Script.include([
var toolIconUrl = Script.resolvePath("assets/images/tools/"); var toolIconUrl = Script.resolvePath("assets/images/tools/");
var DIRECTORY_WINDOW_URL = "https://metaverse.highfidelity.com/directory"; var DIRECTORY_WINDOW_URL = Account.metaverseServerURL + "/directory";
var directoryWindow = new OverlayWebWindow({ var directoryWindow = new OverlayWebWindow({
title: 'Directory', title: 'Directory',
source: "about:blank", source: "about:blank",

2
scripts/system/edit.js
View file

@ -163,7 +163,7 @@ var importingSVOTextOverlay = Overlays.addOverlay("text", {
visible: false visible: false
}); });
var MARKETPLACE_URL = "https://metaverse.highfidelity.com/marketplace"; var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace";
var marketplaceWindow = new OverlayWebWindow({ var marketplaceWindow = new OverlayWebWindow({
title: 'Marketplace', title: 'Marketplace',
source: "about:blank", source: "about:blank",

6
scripts/system/html/js/marketplacesInject.js
View file

@ -29,6 +29,7 @@
var commerceMode = false; var commerceMode = false;
var userIsLoggedIn = false; var userIsLoggedIn = false;
var walletNeedsSetup = false; var walletNeedsSetup = false;
var metaverseServerURL = "https://metaverse.highfidelity.com";
function injectCommonCode(isDirectoryPage) { function injectCommonCode(isDirectoryPage) {
@ -57,7 +58,7 @@
); );
// Footer. // Footer.
var isInitialHiFiPage = location.href === "https://metaverse.highfidelity.com/marketplace?"; var isInitialHiFiPage = location.href === metaverseServerURL + "/marketplace?";
$("body").append( $("body").append(
'<div id="marketplace-navigation">' + '<div id="marketplace-navigation">' +
(!isInitialHiFiPage ? '<input id="back-button" type="button" class="white" value="&lt; Back" />' : '') + (!isInitialHiFiPage ? '<input id="back-button" type="button" class="white" value="&lt; Back" />' : '') +
@ -69,7 +70,7 @@
// Footer actions. // Footer actions.
$("#back-button").on("click", function () { $("#back-button").on("click", function () {
(document.referrer !== "") ? window.history.back() : window.location = "https://metaverse.highfidelity.com/marketplace?"; (document.referrer !== "") ? window.history.back() : window.location = (metaverseServerURL + "/marketplace?");
}); });
$("#all-markets").on("click", function () { $("#all-markets").on("click", function () {
EventBridge.emitWebEvent(GOTO_DIRECTORY); EventBridge.emitWebEvent(GOTO_DIRECTORY);
@ -641,6 +642,7 @@
commerceMode = !!parsedJsonMessage.data.commerceMode; commerceMode = !!parsedJsonMessage.data.commerceMode;
userIsLoggedIn = !!parsedJsonMessage.data.userIsLoggedIn; userIsLoggedIn = !!parsedJsonMessage.data.userIsLoggedIn;
walletNeedsSetup = !!parsedJsonMessage.data.walletNeedsSetup; walletNeedsSetup = !!parsedJsonMessage.data.walletNeedsSetup;
metaverseServerURL = parsedJsonMessage.data.metaverseServerURL;
injectCode(); injectCode();
} }
} }

6
scripts/system/marketplaces/marketplaces.js
View file

@ -15,7 +15,8 @@
Script.include("../libraries/WebTablet.js"); Script.include("../libraries/WebTablet.js");
var MARKETPLACE_URL = "https://metaverse.highfidelity.com/marketplace"; var METAVERSE_SERVER_URL = Account.metaverseServerURL;
var MARKETPLACE_URL = METAVERSE_SERVER_URL + "/marketplace";
var MARKETPLACE_URL_INITIAL = MARKETPLACE_URL + "?"; // Append "?" to signal injected script that it's the initial page. var MARKETPLACE_URL_INITIAL = MARKETPLACE_URL + "?"; // Append "?" to signal injected script that it's the initial page.
var MARKETPLACES_URL = Script.resolvePath("../html/marketplaces.html"); var MARKETPLACES_URL = Script.resolvePath("../html/marketplaces.html");
var MARKETPLACES_INJECT_SCRIPT_URL = Script.resolvePath("../html/js/marketplacesInject.js"); var MARKETPLACES_INJECT_SCRIPT_URL = Script.resolvePath("../html/js/marketplacesInject.js");
@ -155,7 +156,8 @@
data: { data: {
commerceMode: Settings.getValue("commerce", false), commerceMode: Settings.getValue("commerce", false),
userIsLoggedIn: Account.loggedIn, userIsLoggedIn: Account.loggedIn,
walletNeedsSetup: Wallet.walletStatus === 1 walletNeedsSetup: Wallet.walletStatus === 1,
metaverseServerURL: Account.metaverseServerURL
} }
})); }));
} }

2
scripts/system/tablet-users.js
View file

@ -14,7 +14,7 @@
var USERS_URL = "https://hifi-content.s3.amazonaws.com/faye/tablet-dev/users.html"; var USERS_URL = "https://hifi-content.s3.amazonaws.com/faye/tablet-dev/users.html";
var HOME_BUTTON_TEXTURE = Script.resourcesPath() + "meshes/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png"; var HOME_BUTTON_TEXTURE = Script.resourcesPath() + "meshes/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png";
var FRIENDS_WINDOW_URL = "https://metaverse.highfidelity.com/user/friends"; var FRIENDS_WINDOW_URL = Account.metaverseServerURL + "/user/friends";
var FRIENDS_WINDOW_WIDTH = 290; var FRIENDS_WINDOW_WIDTH = 290;
var FRIENDS_WINDOW_HEIGHT = 500; var FRIENDS_WINDOW_HEIGHT = 500;
var FRIENDS_WINDOW_TITLE = "Add/Remove Friends"; var FRIENDS_WINDOW_TITLE = "Add/Remove Friends";

2
scripts/tutorials/getDomainMetadata.js
View file

@ -6,7 +6,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
var SERVER = 'https://metaverse.highfidelity.com/api/v1'; var SERVER = Account.metaverseServerURL + '/api/v1';
var OVERLAY = null; var OVERLAY = null;