浏览代码

Updates app.bundle.js

j8
paweldomas 10 年前
父节点
当前提交
e79d476d89
共有 2 个文件被更改,包括 46 次插入13 次删除
  1. 1
    1
      index.html
  2. 45
    12
      libs/app.bundle.js

+ 1
- 1
index.html 查看文件

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

+ 45
- 12
libs/app.bundle.js 查看文件

2067
 module.exports = RTCUtils;
2067
 module.exports = RTCUtils;
2068
 
2068
 
2069
 },{"../../service/RTC/Resolutions":166,"../xmpp/SDPUtil":60,"./RTCBrowserType":10,"./adapter.screenshare":12}],12:[function(require,module,exports){
2069
 },{"../../service/RTC/Resolutions":166,"../xmpp/SDPUtil":60,"./RTCBrowserType":10,"./adapter.screenshare":12}],12:[function(require,module,exports){
2070
-/*! adapterjs - custom version from - 2015-08-18 */
2070
+/*! adapterjs - custom version from - 2015-08-19 */
2071
 
2071
 
2072
 // Adapter's interface.
2072
 // Adapter's interface.
2073
 var AdapterJS = AdapterJS || {};
2073
 var AdapterJS = AdapterJS || {};
2423
         AdapterJS.WebRTCPlugin.isPluginInstalled(
2423
         AdapterJS.WebRTCPlugin.isPluginInstalled(
2424
           AdapterJS.WebRTCPlugin.pluginInfo.prefix,
2424
           AdapterJS.WebRTCPlugin.pluginInfo.prefix,
2425
           AdapterJS.WebRTCPlugin.pluginInfo.plugName,
2425
           AdapterJS.WebRTCPlugin.pluginInfo.plugName,
2426
-          AdapterJS.WebRTCPlugin.defineWebRTCInterface,
2427
-          function() {
2426
+          function() { // plugin now installed
2428
             clearInterval(pluginInstallInterval);
2427
             clearInterval(pluginInstallInterval);
2429
             AdapterJS.WebRTCPlugin.defineWebRTCInterface();
2428
             AdapterJS.WebRTCPlugin.defineWebRTCInterface();
2430
           },
2429
           },
2431
-          function() {
2432
-            //Does nothing because not used here
2430
+          function() { 
2431
+            // still no plugin detected, nothing to do
2433
           });
2432
           });
2434
       } , 500);
2433
       } , 500);
2435
     });   
2434
     });   
2802
     return to;
2801
     return to;
2803
   };
2802
   };
2804
 
2803
 
2804
+  AdapterJS.maybeThroughWebRTCReady();
2805
+} else if (navigator.mediaDevices && navigator.userAgent.match(
2806
+    /Edge\/(\d+).(\d+)$/)) {
2807
+  webrtcDetectedBrowser = 'edge';
2808
+
2809
+  webrtcDetectedVersion =
2810
+    parseInt(navigator.userAgent.match(/Edge\/(\d+).(\d+)$/)[2], 10);
2811
+
2812
+  // the minimum version still supported by adapter.
2813
+  webrtcMinimumVersion = 12;
2814
+
2815
+  getUserMedia = navigator.getUserMedia;
2816
+
2817
+  attachMediaStream = function(element, stream) {
2818
+    element.srcObject = stream;
2819
+    return element;
2820
+  };
2821
+  reattachMediaStream = function(to, from) {
2822
+    to.srcObject = from.srcObject;
2823
+    return to;
2824
+  };
2825
+
2805
   AdapterJS.maybeThroughWebRTCReady();
2826
   AdapterJS.maybeThroughWebRTCReady();
2806
 } else { // TRY TO USE PLUGIN
2827
 } else { // TRY TO USE PLUGIN
2807
   // IE 9 is not offering an implementation of console.log until you open a console
2828
   // IE 9 is not offering an implementation of console.log until you open a console
2954
   AdapterJS.WebRTCPlugin.defineWebRTCInterface = function () {
2975
   AdapterJS.WebRTCPlugin.defineWebRTCInterface = function () {
2955
     if (AdapterJS.WebRTCPlugin.pluginState ===
2976
     if (AdapterJS.WebRTCPlugin.pluginState ===
2956
         AdapterJS.WebRTCPlugin.PLUGIN_STATES.READY) {
2977
         AdapterJS.WebRTCPlugin.PLUGIN_STATES.READY) {
2957
-      console.error("WebRTC interface has been defined already");
2978
+      console.error("AdapterJS - WebRTC interface has already been defined");
2958
       return;
2979
       return;
2959
     }
2980
     }
2981
+
2960
     AdapterJS.WebRTCPlugin.pluginState = AdapterJS.WebRTCPlugin.PLUGIN_STATES.INITIALIZING;
2982
     AdapterJS.WebRTCPlugin.pluginState = AdapterJS.WebRTCPlugin.PLUGIN_STATES.INITIALIZING;
2961
 
2983
 
2962
     AdapterJS.isDefined = function (variable) {
2984
     AdapterJS.isDefined = function (variable) {
3053
       }
3075
       }
3054
 
3076
 
3055
       var elementId = element.id.length === 0 ? Math.random().toString(36).slice(2) : element.id;
3077
       var elementId = element.id.length === 0 ? Math.random().toString(36).slice(2) : element.id;
3056
-      if (!element.isWebRTCPlugin || !element.isWebRTCPlugin()) {
3078
+      var nodeName = element.nodeName.toLowerCase();
3079
+      if (nodeName !== 'object') { // not a plugin <object> tag yet
3057
         var tag;
3080
         var tag;
3058
-        switch(element.nodeName.toLowerCase()) {
3081
+        switch(nodeName) {
3059
           case 'audio':
3082
           case 'audio':
3060
             tag = AdapterJS.WebRTCPlugin.TAGS.AUDIO;
3083
             tag = AdapterJS.WebRTCPlugin.TAGS.AUDIO;
3061
             break;
3084
             break;
3106
         frag.width = width;
3129
         frag.width = width;
3107
         frag.height = height;
3130
         frag.height = height;
3108
         element.parentNode.removeChild(element);
3131
         element.parentNode.removeChild(element);
3109
-      } else {
3132
+      } else { // already an <object> tag, just change the stream id
3110
         var children = element.children;
3133
         var children = element.children;
3111
         for (var i = 0; i !== children.length; ++i) {
3134
         for (var i = 0; i !== children.length; ++i) {
3112
           if (children[i].name === 'streamId') {
3135
           if (children[i].name === 'streamId') {
3118
       }
3141
       }
3119
       var newElement = document.getElementById(elementId);
3142
       var newElement = document.getElementById(elementId);
3120
       newElement.onplaying = (element.onplaying) ? element.onplaying : function (arg) {};
3143
       newElement.onplaying = (element.onplaying) ? element.onplaying : function (arg) {};
3144
+      newElement.onclick   = (element.onclick)   ? element.onclick   : function (arg) {};
3121
       if (isIE) { // on IE the event needs to be plugged manually
3145
       if (isIE) { // on IE the event needs to be plugged manually
3122
         newElement.attachEvent('onplaying', newElement.onplaying);
3146
         newElement.attachEvent('onplaying', newElement.onplaying);
3123
-        newElement.onclick = (element.onclick) ? element.onclick : function (arg) {};
3124
         newElement._TemOnClick = function (id) {
3147
         newElement._TemOnClick = function (id) {
3125
           var arg = {
3148
           var arg = {
3126
             srcElement : document.getElementById(id)
3149
             srcElement : document.getElementById(id)
8694
     if (isVisible) {
8717
     if (isVisible) {
8695
         LargeVideo.VideoLayout.largeVideoUpdated(currentSmallVideo);
8718
         LargeVideo.VideoLayout.largeVideoUpdated(currentSmallVideo);
8696
 
8719
 
8697
-        $('#largeVideoWrapper').fadeIn(300);
8720
+        $('#largeVideoWrapper').fadeTo(300, 1);
8698
     }
8721
     }
8699
 }
8722
 }
8700
 
8723
 
8829
             // If for any reason large video was hidden before calling fadeOut
8852
             // If for any reason large video was hidden before calling fadeOut
8830
             // changeVideo will never be called, so we call show() in chain just
8853
             // changeVideo will never be called, so we call show() in chain just
8831
             // to be sure
8854
             // to be sure
8832
-            $('#largeVideoWrapper').show().fadeOut(300,
8855
+            $('#largeVideoWrapper').show().fadeTo(300, 0,
8833
                 changeVideo.bind($('#largeVideo'), this.isLargeVideoVisible()));
8856
                 changeVideo.bind($('#largeVideo'), this.isLargeVideoVisible()));
8834
         } else {
8857
         } else {
8835
             if (currentSmallVideo) {
8858
             if (currentSmallVideo) {
10213
             localAudio.autoplay = true;
10236
             localAudio.autoplay = true;
10214
             localAudio.volume = 0;
10237
             localAudio.volume = 0;
10215
         }
10238
         }
10239
+        // Now when Temasys plugin is converting also <audio> elements to
10240
+        // plugin's <object>s, in current layout it will capture click events
10241
+        // before it reaches the local video object. We hide it here in order
10242
+        // to prevent that.
10243
+        if (RTCBrowserType.isIExplorer()) {
10244
+            // The issue is not present on Safari. Also if we hide it in Safari
10245
+            // then the local audio track will have 'enabled' flag set to false
10246
+            // which will result in audio mute issues
10247
+            $('#localAudio').hide();
10248
+        }
10216
     };
10249
     };
10217
 
10250
 
10218
     my.changeLocalVideo = function(stream, isMuted) {
10251
     my.changeLocalVideo = function(stream, isMuted) {

正在加载...
取消
保存