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

Updates app.bundle.js.

This commit is contained in:
George Politis 2015-03-05 20:24:56 +01:00
parent 30f3168bf7
commit b690f5d4a1
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -19,7 +19,7 @@
<script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib --> <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
<script src="libs/toastr.js?v=1"></script><!-- notifications lib --> <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
<script src="interface_config.js?v=5"></script> <script src="interface_config.js?v=5"></script>
<script src="libs/app.bundle.js?v=28"></script> <script src="libs/app.bundle.js?v=29"></script>
<script src="analytics.js?v=1"></script><!-- google analytics plugin --> <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
<link rel="stylesheet" href="css/font.css?v=6"/> <link rel="stylesheet" href="css/font.css?v=6"/>
<link rel="stylesheet" href="css/toastr.css?v=1"> <link rel="stylesheet" href="css/toastr.css?v=1">

14
libs/app.bundle.js
View File

@ -1007,8 +1007,14 @@ function RTCUtils(RTCService)
this.getUserMedia = navigator.mozGetUserMedia.bind(navigator); this.getUserMedia = navigator.mozGetUserMedia.bind(navigator);
this.pc_constraints = {}; this.pc_constraints = {};
this.attachMediaStream = function (element, stream) { this.attachMediaStream = function (element, stream) {
console.log('Attaching', stream, ' to ', element); // srcObject is being standardized and FF will eventually
element[0].src = URL.createObjectURL(stream); // support that unprefixed. FF also supports the
// "element.src = URL.createObjectURL(...)" combo, but that
// will be deprecated in favour of srcObject.
//
// https://groups.google.com/forum/#!topic/mozilla.dev.media/pKOiioXonJg
// https://github.com/webrtc/samples/issues/302
element[0].mozSrcObject = stream;
element[0].play(); element[0].play();
}; };
this.getStreamID = function (stream) { this.getStreamID = function (stream) {
@ -1020,10 +1026,10 @@ function RTCUtils(RTCService)
return tracks[0].id.replace(/[\{,\}]/g,""); return tracks[0].id.replace(/[\{,\}]/g,"");
}; };
this.getVideoSrc = function (element) { this.getVideoSrc = function (element) {
return element.src; return element.mozSrcObject;
}; };
this.setVideoSrc = function (element, src) { this.setVideoSrc = function (element, src) {
element.src = src; element.mozSrcObject = src;
}; };
RTCSessionDescription = mozRTCSessionDescription; RTCSessionDescription = mozRTCSessionDescription;
RTCIceCandidate = mozRTCIceCandidate; RTCIceCandidate = mozRTCIceCandidate;