Merge branch 'master' into soon
commit
724e4e39f5
www/common
|
@ -36,7 +36,7 @@
|
|||
"alertifyjs": "1.0.11",
|
||||
"scrypt-async": "1.2.0",
|
||||
"require-css": "0.1.10",
|
||||
"less": "^3.7.1",
|
||||
"less": "3.7.1",
|
||||
"bootstrap": "^v4.0.0",
|
||||
"diff-dom": "2.1.1",
|
||||
"nthen": "^0.1.5",
|
||||
|
|
|
@ -1112,11 +1112,11 @@ define([
|
|||
};
|
||||
|
||||
common.isWebRTCSupported = function () {
|
||||
return navigator.getUserMedia ||
|
||||
return Boolean(navigator.getUserMedia ||
|
||||
navigator.webkitGetUserMedia ||
|
||||
navigator.mozGetUserMedia ||
|
||||
navigator.msGetUserMedia ||
|
||||
window.RTCPeerConnection;
|
||||
window.RTCPeerConnection);
|
||||
};
|
||||
|
||||
common.ready = (function () {
|
||||
|
|
Loading…
Reference in New Issue