Browse Source

Fixes some issue for FF

master
hristoterezov 10 years ago
parent
commit
f6ac3bdf58
4 changed files with 330 additions and 251 deletions
  1. 0
    10
      .editorconfig
  2. 1
    0
      .gitattributes
  3. 326
    239
      lib-jitsi-meet.js
  4. 3
    2
      modules/RTC/RTCUtils.js

+ 0
- 10
.editorconfig View File

@@ -1,10 +0,0 @@
1
-# http://editorconfig.org
2
-root = true
3
-
4
-[*]
5
-charset = utf-8
6
-end_of_line = lf
7
-indent_size = 4
8
-indent_style = space
9
-max_line_length = 80
10
-trim_trailing_whitespace = true

+ 1
- 0
.gitattributes View File

@@ -1 +1,2 @@
1 1
 *.bundle.js -text -diff
2
+.editorconfig

+ 326
- 239
lib-jitsi-meet.js
File diff suppressed because it is too large
View File


+ 3
- 2
modules/RTC/RTCUtils.js View File

@@ -330,12 +330,13 @@ function enumerateDevicesThroughMediaStreamTrack (callback) {
330 330
 }
331 331
 
332 332
 function obtainDevices(options) {
333
-    if (!options.devices || options.devices.length === 0) {
334
-        return options.successCallback(options.streams);
333
+    if(!options.devices || options.devices.length === 0) {
334
+        return options.successCallback(options.streams || {});
335 335
     }
336 336
 
337 337
     var device = options.devices.splice(0, 1);
338 338
     options.deviceGUM[device](function (stream) {
339
+            options.streams = options.streams || {};
339 340
             options.streams[device] = stream;
340 341
             obtainDevices(options);
341 342
         },

Loading…
Cancel
Save