Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-06 18:13:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

more workarounds for the backwards-incompatible EventBridge changes

Browse source
This commit is contained in:
humbletim 2017-06-21 16:35:29 -04:00
parent 9d4f9b0a4b
commit c9874a7489
3 changed files with 34 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
unpublishedScripts/marketplace/camera-move/app.html
View file

@ -97,7 +97,6 @@ try {
log('openEventBridge.opened', window.EventBridge);
bridgedSettings = new BridgedSettings({
eventBridge: window.EventBridge,
namespace: PARAMS.namespace,
uuid: PARAMS.uuid,
debug: PARAMS.debug,

30
unpublishedScripts/marketplace/camera-move/modules/_utils.js
View file

@ -233,28 +233,42 @@ function BrowserUtils(global) {
},
// openEventBridge handles the cluster of scenarios Interface has imposed on webviews for making EventBridge connections
openEventBridge: function openEventBridge(callback) {
this.log('openEventBridge |', 'typeof global.EventBridge == ' + typeof global.EventBridge);
this.log('openEventBridge |', 'typeof global.EventBridge == ' + [typeof global.EventBridge, global.EventBridge ]);
var error;
try {
global.EventBridge.toString = function() { return '[global.EventBridge at startup]'; };
global.EventBridge.scriptEventReceived.connect.exists;
// this.log('openEventBridge| EventBridge already exists... -- invoking callback', 'typeof EventBridge == ' + typeof global.EventBridge);
return callback(global.EventBridge);
try {
return callback(global.EventBridge);
} catch(e) {
error = e;
}
} catch (e) {
this.log('EventBridge does not yet exist in a usable state -- attempting to instrument via qt.webChannelTransport',
Object.keys(global.EventBridge));
this.log('EventBridge not found in a usable state -- attempting to instrument via qt.webChannelTransport',
Object.keys(global.EventBridge||{}));
var QWebChannel = assert(global.QWebChannel, 'expected global.QWebChannel to exist'),
qt = assert(global.qt, 'expected global.qt to exist');
assert(qt.webChannelTransport, 'expected global.qt.webChannelTransport to exist');
new QWebChannel(qt.webChannelTransport, bind(this, function (channel) {
var objects = channel.objects;
assert(!global.EventBridge, '... global.EventBridge was unavailable at page load, but has unexpectedly materialized; ' +
Object.keys(global.EventBridge));
global.EventBridge = objects.eventBridge || (objects.eventBridgeWrapper && objects.eventBridgeWrapper.eventBridge);
assert(global.EventBridge, '!global.EventBridge');
if (global.EventBridge) {
log('>>> global.EventBridge was unavailable at page load, but has spontaneously materialized; ' +
[ typeof global.EventBridge, global.EventBridge ]);
}
var eventBridge = objects.eventBridge || (objects.eventBridgeWrapper && objects.eventBridgeWrapper.eventBridge);
eventBridge.toString = function() { return '[window.EventBridge per QWebChannel]'; };
assert(!global.EventBridge || global.EventBridge === eventBridge, 'global.EventBridge !== QWebChannel eventBridge\n' +
[global.EventBridge, eventBridge]);
global.EventBridge = eventBridge;
global.EventBridge.$WebChannel = channel;
this.log('openEventBridge opened -- invoking callback', 'typeof EventBridge === ' + typeof global.EventBridge);
callback(global.EventBridge);
}));
}
if (error) {
throw error;
}
},
};
}

13
unpublishedScripts/marketplace/camera-move/modules/custom-settings-app/browser/BridgedSettings.js
View file

@ -30,8 +30,19 @@
function BridgedSettings(options) {
options = options || {};
// Note: Interface changed how window.EventBridge behaves again; it now arbitrarily replaces the global value
// sometime after the initial page load, invaliding any held references to it.
// As a workaround this proxies the local property to the current global value.
var _lastEventBridge = global.EventBridge;
Object.defineProperty(this, 'eventBridge', { enumerable: true, get: function() {
if (_lastEventBridge !== global.EventBridge) {
log('>>> EventBridge changed in-flight', '(was: ' + _lastEventBridge + ' | is: ' + global.EventBridge + ')');
_lastEventBridge = global.EventBridge;
}
return global.EventBridge;
}});
Object.assign(this, {
eventBridge: options.eventBridge || global.EventBridge,
//eventBridge: options.eventBridge || global.EventBridge,
namespace: options.namespace || 'BridgedSettings',
uuid: options.uuid || undefined,
valueReceived: signal(function valueReceived(key, newValue, oldValue, origin){}),