haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes locking at WaitForPluginReady with Temasys plugin install detection.

This commit is contained in:
paweldomas 2015-08-12 14:19:43 +02:00
parent 4c4e99c51a
commit cb024be2d6
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/RTC/adapter.screenshare.js
View File

@ -1,4 +1,4 @@
/*! adapterjs - v0.11.1 - 2015-07-28 */ /*! adapterjs - custom version from - 2015-08-12 */
// Adapter's interface. // Adapter's interface.
var AdapterJS = AdapterJS || {}; var AdapterJS = AdapterJS || {};
@ -348,7 +348,10 @@ AdapterJS.renderNotificationBar = function (text, buttonText, buttonLink, openNe
AdapterJS.WebRTCPlugin.isPluginInstalled( AdapterJS.WebRTCPlugin.isPluginInstalled(
AdapterJS.WebRTCPlugin.pluginInfo.prefix, AdapterJS.WebRTCPlugin.pluginInfo.prefix,
AdapterJS.WebRTCPlugin.pluginInfo.plugName, AdapterJS.WebRTCPlugin.pluginInfo.plugName,
AdapterJS.WebRTCPlugin.defineWebRTCInterface, function() {
clearInterval(pluginInstallInterval);
AdapterJS.WebRTCPlugin.defineWebRTCInterface()
},
function() { //Does nothing because not used here function() { //Does nothing because not used here
}); });
} , 500); } , 500);
@ -872,6 +875,11 @@ if (navigator.mozGetUserMedia) {
}; };
AdapterJS.WebRTCPlugin.defineWebRTCInterface = function () { AdapterJS.WebRTCPlugin.defineWebRTCInterface = function () {
if (AdapterJS.WebRTCPlugin.pluginState ===
AdapterJS.WebRTCPlugin.PLUGIN_STATES.READY) {
console.error("WebRTC interface has been defined already");
return;
}
AdapterJS.WebRTCPlugin.pluginState = AdapterJS.WebRTCPlugin.PLUGIN_STATES.INITIALIZING; AdapterJS.WebRTCPlugin.pluginState = AdapterJS.WebRTCPlugin.PLUGIN_STATES.INITIALIZING;
AdapterJS.isDefined = function (variable) { AdapterJS.isDefined = function (variable) {