BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6097 from capilkey/upgrade-adapter-js

Browse Source 
Update adapter.js in the Flash client and make sure it loads in correct order
This commit is contained in:
Richard Alam 2018-09-20 15:40:30 -04:00 committed by GitHub
commit 8e3a11d780
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5402 additions and 3203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bigbluebutton-client/resources/prod/BigBlueButton.html
View File

@ -143,9 +143,10 @@
<script src="lib/kurento-utils.js" language="javascript"></script>
<script src="lib/bbb_api_bridge.js?v=VERSION" language="javascript"></script>
<script src="lib/sip.js?v=VERSION" language="javascript"></script>
<script src="lib/adapter.js?v=VERSION" language="javascript"></script>
<script src="lib/sip.js?v=VERSION" language="javascript"></script>
<script src="lib/webrtc_stats_bridge.js?v=VERSION" language="javascript"></script>
<script src="lib/bowser.js?v=VERSION" language="javascript"></script>
<script src="lib/bbb_webrtc_bridge_sip.js?v=VERSION" language="javascript"></script>

5488
bigbluebutton-client/resources/prod/lib/adapter.js Normal file → Executable file
View File

File diff suppressed because it is too large Load Diff

2
bigbluebutton-client/resources/prod/lib/sip.js
View File

@ -11838,7 +11838,7 @@ module.exports = {
},
MediaStream: getPrefixedProperty(toplevel, 'MediaStream'),
getUserMedia: getPrefixedProperty(toplevel.navigator, 'getUserMedia'),
getUserMedia: getPrefixedProperty(toplevel.navigator, 'getUserMedia') || navigator.getUserMedia,
RTCPeerConnection: getPrefixedProperty(toplevel, 'RTCPeerConnection'),
RTCSessionDescription: getPrefixedProperty(toplevel, 'RTCSessionDescription'),