mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 04:57:58 +02:00
QmlMarketplace - Fix issues found during test
* 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:
parent
d3cffa50d6
commit
2fe78383ed
3 changed files with 3 additions and 3 deletions
|
@ -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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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"}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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" && (
|
||||||
|
|
Loading…
Reference in a new issue