From ead359ce6772014e4050f7db57d68771dfd42676 Mon Sep 17 00:00:00 2001 From: Fluffy Jenkins Date: Tue, 7 Jan 2020 05:14:38 +0000 Subject: [PATCH 1/2] Fixed clara rubbish --- interface/resources/qml/+webengine/QmlWebWindowView.qml | 2 +- interface/resources/qml/hifi/tablet/TabletRoot.qml | 2 +- interface/resources/qml/hifi/tablet/WindowRoot.qml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/resources/qml/+webengine/QmlWebWindowView.qml b/interface/resources/qml/+webengine/QmlWebWindowView.qml index d2f1820e9a..c2ac92a1a7 100644 --- a/interface/resources/qml/+webengine/QmlWebWindowView.qml +++ b/interface/resources/qml/+webengine/QmlWebWindowView.qml @@ -40,7 +40,7 @@ Controls.WebView { userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ] function onWebEventReceived(event) { - if (event.slice(0, 17) === "CLARA.IO DOWNLOAD") { + if (typeof event === 'string' && event.slice(0, 17) === "CLARA.IO DOWNLOAD") { ApplicationInterface.addAssetToWorldFromURL(event.slice(18)); } } diff --git a/interface/resources/qml/hifi/tablet/TabletRoot.qml b/interface/resources/qml/hifi/tablet/TabletRoot.qml index 6001497743..be8a0cabe0 100644 --- a/interface/resources/qml/hifi/tablet/TabletRoot.qml +++ b/interface/resources/qml/hifi/tablet/TabletRoot.qml @@ -200,7 +200,7 @@ Rectangle { id: eventBridgeConnection target: eventBridge onWebEventReceived: { - if (message.slice(0, 17) === "CLARA.IO DOWNLOAD") { + if (typeof message === 'string' && message.slice(0, 17) === "CLARA.IO DOWNLOAD") { ApplicationInterface.addAssetToWorldFromURL(message.slice(18)); } } diff --git a/interface/resources/qml/hifi/tablet/WindowRoot.qml b/interface/resources/qml/hifi/tablet/WindowRoot.qml index ef2df5e218..05107699e0 100644 --- a/interface/resources/qml/hifi/tablet/WindowRoot.qml +++ b/interface/resources/qml/hifi/tablet/WindowRoot.qml @@ -118,7 +118,7 @@ Windows.ScrollingWindow { id: eventBridgeConnection target: eventBridge onWebEventReceived: { - if (message.slice(0, 17) === "CLARA.IO DOWNLOAD") { + if (typeof message === 'string' && message.slice(0, 17) === "CLARA.IO DOWNLOAD") { ApplicationInterface.addAssetToWorldFromURL(message.slice(18)); } } From e488a668408b989b5b7bec5fbcf87ebb61c00ec1 Mon Sep 17 00:00:00 2001 From: Fluffy Jenkins Date: Tue, 7 Jan 2020 20:59:00 +0000 Subject: [PATCH 2/2] changed quote types --- interface/resources/qml/+webengine/QmlWebWindowView.qml | 2 +- interface/resources/qml/hifi/tablet/TabletRoot.qml | 2 +- interface/resources/qml/hifi/tablet/WindowRoot.qml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/resources/qml/+webengine/QmlWebWindowView.qml b/interface/resources/qml/+webengine/QmlWebWindowView.qml index c2ac92a1a7..84ab61ad28 100644 --- a/interface/resources/qml/+webengine/QmlWebWindowView.qml +++ b/interface/resources/qml/+webengine/QmlWebWindowView.qml @@ -40,7 +40,7 @@ Controls.WebView { userScripts: [ createGlobalEventBridge, raiseAndLowerKeyboard, userScript ] function onWebEventReceived(event) { - if (typeof event === 'string' && event.slice(0, 17) === "CLARA.IO DOWNLOAD") { + if (typeof event === "string" && event.slice(0, 17) === "CLARA.IO DOWNLOAD") { ApplicationInterface.addAssetToWorldFromURL(event.slice(18)); } } diff --git a/interface/resources/qml/hifi/tablet/TabletRoot.qml b/interface/resources/qml/hifi/tablet/TabletRoot.qml index be8a0cabe0..2fa08428ae 100644 --- a/interface/resources/qml/hifi/tablet/TabletRoot.qml +++ b/interface/resources/qml/hifi/tablet/TabletRoot.qml @@ -200,7 +200,7 @@ Rectangle { id: eventBridgeConnection target: eventBridge onWebEventReceived: { - if (typeof message === 'string' && message.slice(0, 17) === "CLARA.IO DOWNLOAD") { + if (typeof message === "string" && message.slice(0, 17) === "CLARA.IO DOWNLOAD") { ApplicationInterface.addAssetToWorldFromURL(message.slice(18)); } } diff --git a/interface/resources/qml/hifi/tablet/WindowRoot.qml b/interface/resources/qml/hifi/tablet/WindowRoot.qml index 05107699e0..d888375db2 100644 --- a/interface/resources/qml/hifi/tablet/WindowRoot.qml +++ b/interface/resources/qml/hifi/tablet/WindowRoot.qml @@ -118,7 +118,7 @@ Windows.ScrollingWindow { id: eventBridgeConnection target: eventBridge onWebEventReceived: { - if (typeof message === 'string' && message.slice(0, 17) === "CLARA.IO DOWNLOAD") { + if (typeof message === "string" && message.slice(0, 17) === "CLARA.IO DOWNLOAD") { ApplicationInterface.addAssetToWorldFromURL(message.slice(18)); } }