Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 09:43:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #12491 from ElderOrb/FB12523

Browse source 
fix for not re-enabling preview on leaving security-sensitive pages in marketplace
This commit is contained in:
Zach Fox 2018-03-06 16:19:39 -08:00 committed by GitHub
commit 04a230c20f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
View file

@ -69,6 +69,10 @@ Item {
hoverEnabled: true; hoverEnabled: true;
} }
Component.onDestruction: {
sendSignalToParent({method: 'maybeEnableHmdPreview'});
}
// This will cause a bug -- if you bring up passphrase selection in HUD mode while // This will cause a bug -- if you bring up passphrase selection in HUD mode while
// in HMD while having HMD preview enabled, then move, then finish passphrase selection, // in HMD while having HMD preview enabled, then move, then finish passphrase selection,
// HMD preview will stay off. // HMD preview will stay off.

2
interface/resources/qml/hifi/commerce/wallet/Wallet.qml
View file

@ -236,6 +236,8 @@ Rectangle {
} else { } else {
sendToScript(msg); sendToScript(msg);
} }
} else if (msg.method === 'maybeEnableHmdPreview') {
sendToScript(msg);
} }
} }
} }

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

@ -115,13 +115,15 @@ var selectionDisplay = null; // for gridTool.js to ignore
var filterText; // Used for updating Purchases QML var filterText; // Used for updating Purchases QML
var onWalletScreen = false; var onWalletScreen = false;
var onCommerceScreen = false;
function onScreenChanged(type, url) { function onScreenChanged(type, url) {
onMarketplaceScreen = type === "Web" && url.indexOf(MARKETPLACE_URL) !== -1; onMarketplaceScreen = type === "Web" && url.indexOf(MARKETPLACE_URL) !== -1;
var onWalletScreenNow = url.indexOf(MARKETPLACE_WALLET_QML_PATH) !== -1; var onWalletScreenNow = url.indexOf(MARKETPLACE_WALLET_QML_PATH) !== -1;
onCommerceScreen = type === "QML" && (url.indexOf(MARKETPLACE_CHECKOUT_QML_PATH) !== -1 || url === MARKETPLACE_PURCHASES_QML_PATH var onCommerceScreenNow = type === "QML" && (url.indexOf(MARKETPLACE_CHECKOUT_QML_PATH) !== -1 || url === MARKETPLACE_PURCHASES_QML_PATH
|| url.indexOf(MARKETPLACE_INSPECTIONCERTIFICATE_QML_PATH) !== -1); || url.indexOf(MARKETPLACE_INSPECTIONCERTIFICATE_QML_PATH) !== -1);
if (!onWalletScreenNow && onWalletScreen) { // exiting wallet screen if ((!onWalletScreenNow && onWalletScreen) || (!onCommerceScreenNow && onCommerceScreen)) { // exiting wallet or commerce screen
if (isHmdPreviewDisabledBySecurity) { if (isHmdPreviewDisabledBySecurity) {
DesktopPreviewProvider.setPreviewDisabledReason("USER"); DesktopPreviewProvider.setPreviewDisabledReason("USER");
Menu.setIsOptionChecked("Disable Preview", false); Menu.setIsOptionChecked("Disable Preview", false);
@ -129,6 +131,7 @@ var selectionDisplay = null; // for gridTool.js to ignore
} }
} }
onCommerceScreen = onCommerceScreenNow;
onWalletScreen = onWalletScreenNow; onWalletScreen = onWalletScreenNow;
wireEventBridge(onMarketplaceScreen || onCommerceScreen || onWalletScreen); wireEventBridge(onMarketplaceScreen || onCommerceScreen || onWalletScreen);