Browse Source

Nukes the enableFirefoxSupport config param.

master
George Politis 10 years ago
parent
commit
e98c8ada6a
5 changed files with 1469 additions and 1488 deletions
  1. 3
    5
      config.js
  2. 1
    1
      index.html
  3. 1463
    1472
      libs/app.bundle.js
  4. 2
    1
      modules/RTC/RTCUtils.js
  5. 0
    9
      modules/xmpp/moderator.js

+ 3
- 5
config.js View File

26
     channelLastN: -1, // The default value of the channel attribute last-n.
26
     channelLastN: -1, // The default value of the channel attribute last-n.
27
     adaptiveLastN: false,
27
     adaptiveLastN: false,
28
     adaptiveSimulcast: false,
28
     adaptiveSimulcast: false,
29
-    useRtcpMux: true,
30
-    useBundle: true,
29
+    useRtcpMux: true, // required for FF support
30
+    useBundle: true, // required for FF support
31
     enableRecording: false,
31
     enableRecording: false,
32
     enableWelcomePage: true,
32
     enableWelcomePage: true,
33
-    enableSimulcast: false,
34
-    enableFirefoxSupport: false, //firefox support is still experimental and
35
-    // will work when simulcast is *disabled* and rtcpMux & bundle are *enabled*.
33
+    enableSimulcast: false, // blocks FF support
36
     logStats: false, // Enable logging of PeerConnection stats via the focus
34
     logStats: false, // Enable logging of PeerConnection stats via the focus
37
     /*noticeMessage: 'Service update is scheduled for 16th March 2015. ' +
35
     /*noticeMessage: 'Service update is scheduled for 16th March 2015. ' +
38
     'During that time service will not be available. ' +
36
     'During that time service will not be available. ' +

+ 1
- 1
index.html View File

19
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
19
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
20
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
20
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
21
     <script src="interface_config.js?v=5"></script>
21
     <script src="interface_config.js?v=5"></script>
22
-    <script src="libs/app.bundle.js?v=51"></script>
22
+    <script src="libs/app.bundle.js?v=52"></script>
23
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
23
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
24
     <link rel="stylesheet" href="css/font.css?v=6"/>
24
     <link rel="stylesheet" href="css/font.css?v=6"/>
25
     <link rel="stylesheet" href="css/toastr.css?v=1">
25
     <link rel="stylesheet" href="css/toastr.css?v=1">

+ 1463
- 1472
libs/app.bundle.js
File diff suppressed because it is too large
View File


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

130
     if (navigator.mozGetUserMedia) {
130
     if (navigator.mozGetUserMedia) {
131
         console.log('This appears to be Firefox');
131
         console.log('This appears to be Firefox');
132
         var version = parseInt(navigator.userAgent.match(/Firefox\/([0-9]+)\./)[1], 10);
132
         var version = parseInt(navigator.userAgent.match(/Firefox\/([0-9]+)\./)[1], 10);
133
-        if (version >= 38) {
133
+        if (version >= 38
134
+            && !config.enableSimulcast && config.useBundle && config.useRtcpMux) {
134
             this.peerconnection = mozRTCPeerConnection;
135
             this.peerconnection = mozRTCPeerConnection;
135
             this.browser = RTCBrowserType.RTC_BROWSER_FIREFOX;
136
             this.browser = RTCBrowserType.RTC_BROWSER_FIREFOX;
136
             this.getUserMedia = navigator.mozGetUserMedia.bind(navigator);
137
             this.getUserMedia = navigator.mozGetUserMedia.bind(navigator);

+ 0
- 9
modules/xmpp/moderator.js View File

177
                 { name: 'openSctp', value: config.openSctp})
177
                 { name: 'openSctp', value: config.openSctp})
178
                 .up();
178
                 .up();
179
         }
179
         }
180
-        var roomName = APP.UI.generateRoomName();
181
-        if (typeof roomName !== 'string') roomName = '';
182
-        if (config.enableFirefoxSupport !== undefined && roomName.indexOf('rembson@') === -1) {
183
-            elem.c(
184
-                'property',
185
-                { name: 'enableFirefoxHacks',
186
-                    value: config.enableFirefoxSupport})
187
-                .up();
188
-        }
189
         elem.up();
180
         elem.up();
190
         return elem;
181
         return elem;
191
     },
182
     },

Loading…
Cancel
Save