Remove adapter.js. (#318)

jianjunz · taste1981 · commit f8403a42f4a9 · 2019-11-28T10:08:59.000+08:00
Conference sample still loads adapter.js when running on Edge.
diff --git a/src/samples/conference/public/index.html b/src/samples/conference/public/index.html
@@ -38,19 +38,19 @@
     </div>
     <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js" type="text/javascript"></script>
-    <script src="https://webrtchacks.github.io/adapter/adapter-7.0.0.js" type="text/javascript"></script>
     <script src="../../../../dist/sdk-debug/owt.js" type="text/javascript"></script>
     <script src="scripts/index.js" type="text/javascript"></script>
     <script src="scripts/rest-sample.js" type="text/javascript"></script>
     <script language="JavaScript">
-      function getParameterByName(name) {
-        name = name.replace(/[\[]/, '\\\[').replace(/[\]]/, '\\\]');
-        var regex = new RegExp('[\\?&]' + name + '=([^&#]*)'),
-          results = regex.exec(location.search);
-        return results === null ? '' : decodeURIComponent(results[1].replace(
-          /\+/g, ' '));
-      }
+    // Load adapter.js on Edge.
+    if (window.navigator.userAgent.indexOf("Edge") > -1) {
+      const script = document.createElement("script");
+      script.src = 'https://webrtchacks.github.io/adapter/adapter-7.0.0.js';
+      document.head.appendChild(script);
+      script.onload = runSocketIOSample;
+    } else {
       runSocketIOSample();
+    }
     </script>
   </body>
 
diff --git a/src/samples/p2p/peercall.html b/src/samples/p2p/peercall.html
@@ -51,7 +51,6 @@
 <body>
   <script src="https://code.jquery.com/jquery-1.10.2.min.js" type="text/javascript"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js" type="text/javascript"></script>
-  <script src="https://webrtchacks.github.io/adapter/adapter-7.0.0.js" type="text/javascript"></script>
   <script src="js/sc.websocket.js" type="text/javascript"></script>
   <!-- SDK Starts -->
   <script src="../../../dist/sdk-debug/owt.js" type="text/javascript"></script>
@@ -109,7 +108,7 @@ <h2>ScreenView</h2>
   <script type="text/javascript">
     'use strict';
     var isVideo = 1;
-    var serverAddress = 'http://example.com'; // Please change example.com to signaling server's address.
+    var serverAddress = 'https://example.com:8096'; // Please change example.com to signaling server's address.
     const signaling = new SignalingChannel();
     let publicationForCamera;
     let publicationForScreen;
@@ -147,11 +146,6 @@ <h2>ScreenView</h2>
               source:'screen-cast'
             },
             video:{
-              resolution:{
-                "width": 640,
-                "height":480
-              },
-              frameRate:20,
               source:'screen-cast'
             }
           }
diff --git a/test/p2ptest/fetch_dependencies.py b/test/p2ptest/fetch_dependencies.py
@@ -9,8 +9,7 @@
 
 URLS = {'q.js': 'https://raw.githubusercontent.com/kriskowal/q/c2f5a6f35456389a806acca50bfd929cbe30c4cb/q.js',
         'jquery.min.js': 'https://code.jquery.com/jquery-1.10.2.min.js',
-        'socket.io.min.js': 'https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js',
-        'adapter.js': 'https://webrtc.github.io/adapter/adapter-7.0.0.js'
+        'socket.io.min.js': 'https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js'
         }
 
 DEPS_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), 'dependencies'))
diff --git a/test/p2ptest/karma_config/chrome.config.js b/test/p2ptest/karma_config/chrome.config.js
@@ -7,7 +7,6 @@ module.exports = function (config) {
     files: [
       './test/p2ptest/dependencies/jquery.min.js',
       './test/p2ptest/dependencies/socket.io.min.js',
-      './test/p2ptest/dependencies/adapter.js',
       './test/p2ptest/dependencies/q.js',
       './dist/samples/p2p/js/sc.websocket.js',
       './dist/sdk/owt.js',
diff --git a/test/p2ptest/karma_config/firefox.config.js b/test/p2ptest/karma_config/firefox.config.js
@@ -7,7 +7,6 @@ module.exports = function (config) {
     files: [
       './test/p2ptest/dependencies/jquery.min.js',
       './test/p2ptest/dependencies/socket.io.min.js',
-      './test/p2ptest/dependencies/adapter.js',
       './test/p2ptest/dependencies/q.js',
       './dist/samples/p2p/js/sc.websocket.js',
       './dist/sdk/owt.js',
diff --git a/test/p2ptest/karma_config/safari.config.js b/test/p2ptest/karma_config/safari.config.js
@@ -7,7 +7,6 @@ module.exports = function (config) {
     files: [
       './test/p2ptest/dependencies/jquery.min.js',
       './test/p2ptest/dependencies/socket.io.min.js',
-      './test/p2ptest/dependencies/adapter.js',
       './test/p2ptest/dependencies/q.js',
       './dist/samples/p2p/js/sc.websocket.js',
       './dist/sdk/owt.js',

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,7 @@`
`9`	`9`
`10`	`10`	`URLS = {'q.js': 'https://raw.githubusercontent.com/kriskowal/q/c2f5a6f35456389a806acca50bfd929cbe30c4cb/q.js',`
`11`	`11`	`'jquery.min.js': 'https://code.jquery.com/jquery-1.10.2.min.js',`
`12`		`- 'socket.io.min.js': 'https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js',`
`13`		`- 'adapter.js': 'https://webrtc.github.io/adapter/adapter-7.0.0.js'`
	`12`	`+ 'socket.io.min.js': 'https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js'`
`14`	`13`	`}`
`15`	`14`
`16`	`15`	`DEPS_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), 'dependencies'))`