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

a couple logging fixes

Browse source
This commit is contained in:
SamGondelman 2017-08-14 17:34:32 -07:00
parent 823f2fb252
commit 1c27335193
6 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/qml/Web3DOverlay.qml
View file

@ -15,6 +15,11 @@ import "controls" as Controls
Controls.WebView { Controls.WebView {
// This is for JS/QML communication, which is unused in a Web3DOverlay,
// but not having this here results in spurious warnings about a
// missing signal
signal sendToScript(var message);
function onWebEventReceived(event) { function onWebEventReceived(event) {
if (event.slice(0, 17) === "CLARA.IO DOWNLOAD") { if (event.slice(0, 17) === "CLARA.IO DOWNLOAD") {
ApplicationInterface.addAssetToWorldFromURL(event.slice(18)); ApplicationInterface.addAssetToWorldFromURL(event.slice(18));

5
interface/resources/qml/desktop/Desktop.qml
View file

@ -41,6 +41,11 @@ FocusScope {
// when they're opened. // when they're opened.
signal showDesktop(); signal showDesktop();
// This is for JS/QML communication, which is unused in the Desktop,
// but not having this here results in spurious warnings about a
// missing signal
signal sendToScript(var message);
// Allows QML/JS to find the desktop through the parent chain // Allows QML/JS to find the desktop through the parent chain
property bool desktopRoot: true property bool desktopRoot: true

5
interface/resources/qml/hifi/dialogs/AttachmentsDialog.qml
View file

@ -28,6 +28,11 @@ ScrollingWindow {
HifiConstants { id: hifi } HifiConstants { id: hifi }
// This is for JS/QML communication, which is unused in the AttachmentsDialog,
// but not having this here results in spurious warnings about a
// missing signal
signal sendToScript(var message);
property var settings: Settings { property var settings: Settings {
category: "AttachmentsDialog" category: "AttachmentsDialog"
property alias x: root.x property alias x: root.x

2
scripts/system/edit.js
View file

@ -1228,7 +1228,7 @@ Script.scriptEnding.connect(function () {
Controller.mouseMoveEvent.disconnect(mouseMoveEventBuffered); Controller.mouseMoveEvent.disconnect(mouseMoveEventBuffered);
Controller.mouseReleaseEvent.disconnect(mouseReleaseEvent); Controller.mouseReleaseEvent.disconnect(mouseReleaseEvent);
Messages.messageReceived.disconnect(handleOverlaySelectionToolUpdates); Messages.messageReceived.disconnect(handleMessagesReceived);
Messages.unsubscribe("entityToolUpdates"); Messages.unsubscribe("entityToolUpdates");
Messages.unsubscribe("Toolbar-DomainChanged"); Messages.unsubscribe("Toolbar-DomainChanged");
createButton = null; createButton = null;

1
scripts/system/help.js
View file

@ -61,6 +61,7 @@
tablet.gotoHomeScreen(); tablet.gotoHomeScreen();
} }
button.clicked.disconnect(onClicked); button.clicked.disconnect(onClicked);
tablet.screenChanged.disconnect(onScreenChanged);
Script.clearInterval(interval); Script.clearInterval(interval);
if (tablet) { if (tablet) {
tablet.removeButton(button); tablet.removeButton(button);

4
scripts/system/snapshot.js
View file

@ -764,8 +764,8 @@ Script.scriptEnding.connect(function () {
} }
Window.snapshotShared.disconnect(snapshotUploaded); Window.snapshotShared.disconnect(snapshotUploaded);
Snapshot.snapshotLocationSet.disconnect(snapshotLocationSet); Snapshot.snapshotLocationSet.disconnect(snapshotLocationSet);
Entities.canRezChanged.disconnect(processRezPermissionChange); Entities.canRezChanged.disconnect(updatePrintPermissions);
Entities.canRezTmpChanged.disconnect(processRezPermissionChange); Entities.canRezTmpChanged.disconnect(updatePrintPermissions);
}); });
}()); // END LOCAL_SCOPE }()); // END LOCAL_SCOPE