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

Fix progress messages not displaying in HMD

Browse source
This commit is contained in:
David Rowe 2017-01-13 12:09:22 +13:00
parent 6f2386eabd
commit 632989e031
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,13 +48,25 @@ var marketplaceWindow = new OverlayWebWindow({
}); });
marketplaceWindow.setScriptURL(MARKETPLACES_INJECT_SCRIPT_URL); marketplaceWindow.setScriptURL(MARKETPLACES_INJECT_SCRIPT_URL);
marketplaceWindow.webEventReceived.connect(function (message) { function onWebEventReceived(message) {
if (message === GOTO_DIRECTORY) { if (message === GOTO_DIRECTORY) {
marketplaceWindow.setURL(MARKETPLACES_URL); var url = MARKETPLACES_URL;
if (marketplaceWindow.visible) {
marketplaceWindow.setURL(url);
}
if (marketplaceWebTablet) {
marketplaceWebTablet.setURL(url);
}
return; return;
} }
if (message === QUERY_CAN_WRITE_ASSETS) { if (message === QUERY_CAN_WRITE_ASSETS) {
marketplaceWindow.emitScriptEvent(CAN_WRITE_ASSETS + " " + Entities.canWriteAssets()); var canWriteAssets = CAN_WRITE_ASSETS + " " + Entities.canWriteAssets();
if (marketplaceWindow.visible) {
marketplaceWindow.emitScriptEvent(canWriteAssets);
}
if (marketplaceWebTablet) {
marketplaceWebTablet.getOverlayObject().emitScriptEvent(canWriteAssets);
}
return; return;
} }
if (message === WARN_USER_NO_PERMISSIONS) { if (message === WARN_USER_NO_PERMISSIONS) {
@ -87,7 +99,9 @@ marketplaceWindow.webEventReceived.connect(function (message) {
if (message === CLARA_IO_CANCELLED_DOWNLOAD) { if (message === CLARA_IO_CANCELLED_DOWNLOAD) {
isDownloadBeingCancelled = false; isDownloadBeingCancelled = false;
} }
}); }
marketplaceWindow.webEventReceived.connect(onWebEventReceived);
function onMessageBoxClosed(id, button) { function onMessageBoxClosed(id, button) {
if (id === messageBox && button === CANCEL_BUTTON) { if (id === messageBox && button === CANCEL_BUTTON) {
@ -122,17 +136,7 @@ function showMarketplace() {
marketplaceWebTablet = new WebTablet(MARKETPLACE_URL_INITIAL, null, null, true); marketplaceWebTablet = new WebTablet(MARKETPLACE_URL_INITIAL, null, null, true);
Settings.setValue(persistenceKey, marketplaceWebTablet.pickle()); Settings.setValue(persistenceKey, marketplaceWebTablet.pickle());
marketplaceWebTablet.setScriptURL(MARKETPLACES_INJECT_SCRIPT_URL); marketplaceWebTablet.setScriptURL(MARKETPLACES_INJECT_SCRIPT_URL);
marketplaceWebTablet.getOverlayObject().webEventReceived.connect(function (message) { marketplaceWebTablet.getOverlayObject().webEventReceived.connect(onWebEventReceived);
if (message === GOTO_DIRECTORY) {
marketplaceWebTablet.setURL(MARKETPLACES_URL);
}
if (message === QUERY_CAN_WRITE_ASSETS) {
marketplaceWebTablet.getOverlayObject().emitScriptEvent(CAN_WRITE_ASSETS + " " + Entities.canWriteAssets());
}
if (message === WARN_USER_NO_PERMISSIONS) {
Window.alert(NO_PERMISSIONS_ERROR_MESSAGE);
}
});
} else { } else {
marketplaceWindow.setURL(MARKETPLACE_URL_INITIAL); marketplaceWindow.setURL(MARKETPLACE_URL_INITIAL);
marketplaceWindow.setVisible(true); marketplaceWindow.setVisible(true);