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

QmlMarketplace - Fix issues found during test

Browse source 
* command line --url hifiapp:MARKET was not bringing up correct
marketplace
* Search field was not being cleared when 'home' button was clicked
after a search
* tablet button was not lit when marketplace was launched
This commit is contained in:
Roxanne Skelly 2019-01-28 15:14:49 -08:00
parent d3cffa50d6
commit 2fe78383ed
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/hifi/commerce/marketplace/Marketplace.qml
View file

@ -665,6 +665,7 @@ Rectangle {
categoriesListView.currentIndex = -1; categoriesListView.currentIndex = -1;
categoriesText.text = "Categories"; categoriesText.text = "Categories";
root.categoryString = ""; root.categoryString = "";
searchField.text = "";
getMarketplaceItems(); getMarketplaceItems();
} }
} }

3
interface/src/commerce/QmlCommerce.cpp
View file

@ -54,11 +54,10 @@ void QmlCommerce::openSystemApp(const QString& appName) {
{"GOTO", "hifi/tablet/TabletAddressDialog.qml"}, {"GOTO", "hifi/tablet/TabletAddressDialog.qml"},
{"PEOPLE", "hifi/Pal.qml"}, {"PEOPLE", "hifi/Pal.qml"},
{"WALLET", "hifi/commerce/wallet/Wallet.qml"}, {"WALLET", "hifi/commerce/wallet/Wallet.qml"},
{"MARKET", "/marketplace.html"} {"MARKET", "hifi/commerce/marketplace/Marketplace.qml"}
}; };
static const QMap<QString, QString> systemInject{ static const QMap<QString, QString> systemInject{
{"MARKET", "/scripts/system/html/js/marketplacesInject.js"}
}; };

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

@ -703,7 +703,7 @@ var onMarketplaceScreen = false;
var onWalletScreen = false; var onWalletScreen = false;
var onTabletScreenChanged = function onTabletScreenChanged(type, url) { var onTabletScreenChanged = function onTabletScreenChanged(type, url) {
ui.setCurrentVisibleScreenMetadata(type, url); ui.setCurrentVisibleScreenMetadata(type, url);
onMarketplaceScreen = type === "Web" && url.indexOf(MARKETPLACE_URL) !== -1; onMarketplaceScreen = type === "QML" && url.indexOf(MARKETPLACE_QML_PATH) !== -1;
onInspectionCertificateScreen = type === "QML" && url.indexOf(MARKETPLACE_INSPECTIONCERTIFICATE_QML_PATH) !== -1; onInspectionCertificateScreen = type === "QML" && url.indexOf(MARKETPLACE_INSPECTIONCERTIFICATE_QML_PATH) !== -1;
var onWalletScreenNow = url.indexOf(MARKETPLACE_WALLET_QML_PATH) !== -1; var onWalletScreenNow = url.indexOf(MARKETPLACE_WALLET_QML_PATH) !== -1;
var onCommerceScreenNow = type === "QML" && ( var onCommerceScreenNow = type === "QML" && (