Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 20:48:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #13150 from howard-stearns/fix-lastEdited-vs-pal

Browse source 
fix lastEdited vs pal
This commit is contained in:
Howard Stearns 2018-05-14 15:12:07 -07:00 committed by GitHub
commit d7121265d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/system/pal.js
View file

@ -251,6 +251,7 @@ function fromQml(message) { // messages are {method, params}, like json-rpc. See
}); });
} }
break; break;
case 'refresh': // old name for refreshNearby
case 'refreshNearby': case 'refreshNearby':
data = {}; data = {};
ExtendedOverlay.some(function (overlay) { // capture the audio data ExtendedOverlay.some(function (overlay) { // capture the audio data
@ -743,10 +744,13 @@ function receiveMessage(channel, messageString, senderID) {
var message = JSON.parse(messageString); var message = JSON.parse(messageString);
switch (message.method) { switch (message.method) {
case 'select': case 'select':
sendToQml(message); // Accepts objects, not just strings. if (!onPalScreen) {
tablet.loadQMLSource(PAL_QML_SOURCE);
Script.setTimeout(function () { sendToQml(message); }, 1000);
} else {
sendToQml(message); // Accepts objects, not just strings.
}
break; break;
default:
print('Unrecognized PAL message', messageString);
} }
} }