From 5257a254cb95498d290ff34b41854ff022043b46 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard@highfidelity.io>
Date: Mon, 4 Jun 2018 13:12:41 -0700
Subject: [PATCH] more for the previous
---
scripts/system/pal.js | 2 +-
scripts/system/tablet-goto.js | 37 -----------------------------------
2 files changed, 1 insertion(+), 38 deletions(-)
diff --git a/scripts/system/pal.js b/scripts/system/pal.js
index b122a5170a..41774629e7 100644
--- a/scripts/system/pal.js
+++ b/scripts/system/pal.js
@@ -318,7 +318,7 @@ function fromQml(message) { // messages are {method, params}, like json-rpc. See
);
break;
case 'http.request':
- break; // Handled elsewhere.
+ break; // Handled by request-service.
default:
print('Unrecognized message from Pal.qml:', JSON.stringify(message));
}
diff --git a/scripts/system/tablet-goto.js b/scripts/system/tablet-goto.js
index 9cd8420a88..46ddeb2bab 100644
--- a/scripts/system/tablet-goto.js
+++ b/scripts/system/tablet-goto.js
@@ -41,24 +41,6 @@
sortOrder: 8
});
- function fromQml(message) {
- console.debug('tablet-goto::fromQml: message = ', JSON.stringify(message));
-
- var response = {id: message.id, jsonrpc: "2.0"};
- switch (message.method) {
- case 'request':
- request(message.params, function (error, data) {
- debug('rpc', request, 'error:', error, 'data:', data);
- response.error = error;
- response.result = data;
- tablet.sendToQml(response);
- });
- return;
- default:
- response.error = {message: 'Unrecognized message', data: message};
- }
- tablet.sendToQml(response);
- }
function messagesWaiting(isWaiting) {
button.editProperties({
icon: isWaiting ? WAITING_ICON : NORMAL_ICON
@@ -66,21 +48,6 @@
});
}
- var hasEventBridge = false;
- function wireEventBridge(on) {
- if (on) {
- if (!hasEventBridge) {
- tablet.fromQml.connect(fromQml);
- hasEventBridge = true;
- }
- } else {
- if (hasEventBridge) {
- tablet.fromQml.disconnect(fromQml);
- hasEventBridge = false;
- }
- }
- }
-
function onClicked() {
if (onGotoScreen) {
// for toolbar-mode: go back to home screen, this will close the window.
@@ -98,15 +65,11 @@
onGotoScreen = true;
shouldActivateButton = true;
button.editProperties({isActive: shouldActivateButton});
- wireEventBridge(true);
messagesWaiting(false);
- tablet.sendToQml({ method: 'refreshFeeds', protocolSignature: Window.protocolSignature() })
-
} else {
shouldActivateButton = false;
onGotoScreen = false;
button.editProperties({isActive: shouldActivateButton});
- wireEventBridge(false);
}
}
button.clicked.connect(onClicked);