Fixed bug in extension install code.
parent
2a08722cf3
commit
a1caff2af3
|
|
@ -197,17 +197,18 @@ export default class RoomClient
|
|||
{
|
||||
logger.debug('installExtension()');
|
||||
|
||||
return Promise.resolve()
|
||||
.then(() =>
|
||||
return new Promise((resolve, reject) =>
|
||||
{
|
||||
window.addEventListener('message', _onExtensionMessage, false);
|
||||
// eslint-disable-next-line no-undef
|
||||
chrome.webstore.install(null, _successfulInstall, _failedInstall);
|
||||
function _onExtensionMessage({ data })
|
||||
{
|
||||
if (data.type === 'ScreenShareInjected')
|
||||
{
|
||||
logger.debug('installExtension() | installation succeeded');
|
||||
|
||||
return;
|
||||
return resolve();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -215,7 +216,7 @@ export default class RoomClient
|
|||
{
|
||||
window.removeEventListener('message', _onExtensionMessage);
|
||||
|
||||
return Promise.reject(
|
||||
return reject(
|
||||
new Error('Failed to install extension: %s', reason));
|
||||
}
|
||||
|
||||
|
|
@ -223,24 +224,19 @@ export default class RoomClient
|
|||
{
|
||||
logger.debug('installExtension() | installation accepted');
|
||||
}
|
||||
|
||||
// eslint-disable-next-line no-undef
|
||||
chrome.webstore.install(null, _successfulInstall, _failedInstall);
|
||||
})
|
||||
.then(() =>
|
||||
{
|
||||
// This should be handled better
|
||||
this._dispatch(stateActions.setScreenCapabilities(
|
||||
{
|
||||
canShareScreen : true,
|
||||
canShareScreen : this._room.canSend('video'),
|
||||
needExtension : false
|
||||
}));
|
||||
})
|
||||
.catch((error) =>
|
||||
{
|
||||
logger.error('enableScreenSharing() | failed: %o', error);
|
||||
|
||||
this._dispatch(
|
||||
stateActions.setScreenShareInProgress(false));
|
||||
logger.error('installExtension() | failed: %o', error);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue