From e23c589de7f7db344256cc7471d8f29d8ee719ca Mon Sep 17 00:00:00 2001 From: Roxanne Skelly Date: Mon, 4 Feb 2019 15:04:18 -0800 Subject: [PATCH] QmlMarketplace - fix issue with footer not appearing in marketplaces list --- .../qml/hifi/commerce/marketplace/MarketplaceItem.qml | 6 ++++-- scripts/system/marketplaces/marketplaces.js | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/hifi/commerce/marketplace/MarketplaceItem.qml b/interface/resources/qml/hifi/commerce/marketplace/MarketplaceItem.qml index cb158a2b69..3d5b1c3bc8 100644 --- a/interface/resources/qml/hifi/commerce/marketplace/MarketplaceItem.qml +++ b/interface/resources/qml/hifi/commerce/marketplace/MarketplaceItem.qml @@ -262,7 +262,7 @@ Rectangle { color: hifi.buttons.blue onClicked: root.buy(); - } + } Item { id: creatorItem @@ -596,7 +596,9 @@ Rectangle { anchors.fill: parent Component.onCompleted: { - loadHtml(""+model.text+""); + descriptionWebView.enabled = false; + loadHtml(""+model.text+""); + descriptionWebView.enabled = true; } onContentsSizeChanged: { diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js index c085763fad..e059081741 100644 --- a/scripts/system/marketplaces/marketplaces.js +++ b/scripts/system/marketplaces/marketplaces.js @@ -41,6 +41,7 @@ var GOTO_DIRECTORY = "GOTO_DIRECTORY"; var GOTO_MARKETPLACE = "GOTO_MARKETPLACE"; var QUERY_CAN_WRITE_ASSETS = "QUERY_CAN_WRITE_ASSETS"; var CAN_WRITE_ASSETS = "CAN_WRITE_ASSETS"; +var WARN_USER_NO_PERMISSIONS = "WARN_USER_NO_PERMISSIONS"; var CLARA_DOWNLOAD_TITLE = "Preparing Download"; var messageBox = null; @@ -436,6 +437,7 @@ function rezEntity(itemHref, itemType, marketplaceItemTesterId) { var referrerURL; // Used for updating Purchases QML var filterText; // Used for updating Purchases QML function onWebEventReceived(message) { + message = JSON.parse(message); if (message.type === GOTO_MARKETPLACE) { openMarketplace(message.itemId); } else if (message.type === GOTO_DIRECTORY) {