Merge branch 'develop' of https://github.com/havfo/multiparty-meeting into develop
commit
73709639e0
|
|
@ -5,6 +5,26 @@ var config =
|
||||||
developmentPort : 3443,
|
developmentPort : 3443,
|
||||||
productionPort : 443,
|
productionPort : 443,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Supported browsers version
|
||||||
|
* in bowser satisfy format.
|
||||||
|
* See more:
|
||||||
|
* https://www.npmjs.com/package/bowser#filtering-browsers
|
||||||
|
* Otherwise you got a unsupported browser page
|
||||||
|
*/
|
||||||
|
supportedBrowsers :
|
||||||
|
{
|
||||||
|
'windows' : {
|
||||||
|
'internet explorer' : '>12',
|
||||||
|
'microsoft edge' : '>18'
|
||||||
|
},
|
||||||
|
'safari' : '>12',
|
||||||
|
'firefox' : '>=60',
|
||||||
|
'chrome' : '>=74',
|
||||||
|
'opera' : '>=62',
|
||||||
|
'samsung internet for android' : '>=11.1.1.52'
|
||||||
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If defaultResolution is set, it will override user settings when joining:
|
* If defaultResolution is set, it will override user settings when joining:
|
||||||
* low ~ 320x240
|
* low ~ 320x240
|
||||||
|
|
|
||||||
|
|
@ -71,6 +71,18 @@ const messages =
|
||||||
'lv' : messagesLatvian
|
'lv' : messagesLatvian
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const supportedBrowsers={
|
||||||
|
'windows' : {
|
||||||
|
'internet explorer' : '>12',
|
||||||
|
'microsoft edge' : '>18'
|
||||||
|
},
|
||||||
|
'safari' : '>12',
|
||||||
|
'firefox' : '>=60',
|
||||||
|
'chrome' : '>=74',
|
||||||
|
'opera' : '>=62',
|
||||||
|
'samsung internet for android' : '>=11.1.1.52'
|
||||||
|
};
|
||||||
|
|
||||||
const browserLanguage = (navigator.language || navigator.browserLanguage).toLowerCase();
|
const browserLanguage = (navigator.language || navigator.browserLanguage).toLowerCase();
|
||||||
|
|
||||||
let locale = browserLanguage.split(/[-_]/)[0]; // language without region code
|
let locale = browserLanguage.split(/[-_]/)[0]; // language without region code
|
||||||
|
|
@ -159,8 +171,14 @@ function run()
|
||||||
webrtcUnavailable=true;
|
webrtcUnavailable=true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
if (device.name === 'safari' && !isNaN(device.version) && parseFloat(device.version) < 12)
|
if (!device.bowser.satisfies(
|
||||||
|
window.config.supportedBrowsers ? window.config.supportedBrowsers : supportedBrowsers)
|
||||||
|
)
|
||||||
{
|
{
|
||||||
|
logger.error(
|
||||||
|
'Your browser is not on the supported list! Ask your server admin to add your browser to the supported list, if you think that your browser should be supported! deviceInfo: %o',
|
||||||
|
device
|
||||||
|
);
|
||||||
unsupportedBrowser=true;
|
unsupportedBrowser=true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue