Fixed createObjectURL/getTracks; released v1.2.8

muaz-khan · Dec 24, 2018 · 043e0f4 · 043e0f4
1 parent 088a6aa
commit 043e0f4
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 47 deletions.
diff --git a/bower.json b/bower.json
@@ -1,11 +1,11 @@
 {
   "name": "canvas-designer",
   "preferGlobal": false,
-  "version": "1.2.7",
+  "version": "1.2.8",
   "author": {
     "name": "Muaz Khan",
     "email": "muazkh@gmail.com",
-    "url": "http://www.muazkhan.com/"
+    "url": "https://muazkhan.com/"
   },
   "description": "Collaborative, extendable, JavaScript Canvas2D drawing tool, supporting dozens of builtin tools.",
   "main": "server.js",

diff --git a/dev/webrtc-handler.js b/dev/webrtc-handler.js
@@ -3,11 +3,10 @@ var webrtcHandler = {
         var captureStream = document.getElementById('main-canvas').captureStream(15);
 
         var peer = this.getPeer();
-        if ('addStream' in peer) {
-            peer.addStream(captureStream);
-        } else {
-            peer.addTrack(captureStream.getVideoTracks()[0], captureStream);
-        }
+
+        captureStream.getTracks().forEach(function(track) {
+            peer.addTrack(track, captureStream);
+        });
 
         peer.onicecandidate = function(event) {
             if (!event || !!event.candidate) {
@@ -50,22 +49,17 @@ var webrtcHandler = {
             });
         });
 
-        if ('onaddstream' in peer) {
-            peer.onaddstream = function(event) {
-                callback({
-                    stream: event.stream
-                });
-            };
-        } else {
-            peer.onaddtrack = function(event) {
-                callback({
-                    stream: event.streams[0]
-                });
-            };
-        }
+        peer.ontrack = function(event) {
+            callback({
+                stream: event.streams[0]
+            });
+        };
     },
     getPeer: function() {
         var WebRTC_Native_Peer = window.RTCPeerConnection || window.webkitRTCPeerConnection || window.mozRTCPeerConnection;
+        var RTCSessionDescription = window.RTCSessionDescription || window.mozRTCSessionDescription;
+        var RTCIceCandidate = window.RTCIceCandidate || window.mozRTCIceCandidate;
+
         var peer = new WebRTC_Native_Peer(null);
         this.peer = peer;
         return peer;

diff --git a/index.html b/index.html
@@ -179,8 +179,9 @@
 <div id="fade" class="black_overlay"></div>
 
 <div id="action-controls" style="width: 19%; padding: 1%;position: absolute;left:0;">
-    <video controls="" style="width: 105%;margin-left: -15px;margin-top: -23px; display: none;"></video>
+    <video controls autoplay playsinline style="width: 105%;margin-left: -15px;margin-top: -23px; display: none;"></video>
 
+    <div id="select-tools">
     <h2>Select Tools</h2>
     <input type="checkbox" id="pencil" checked>
     <label for="pencil">pencil</label><br>
@@ -206,7 +207,7 @@ <h2>Select Tools</h2>
     <input type="checkbox" id="arrow" checked>
     <label for="arrow">arrow</label><br>
 
-		<input type="checkbox" id="zoom">
+	<input type="checkbox" id="zoom">
     <label for="zoom">zoom</label><br>
 
     <input type="checkbox" id="dragSingle" checked>
@@ -241,6 +242,7 @@ <h2>Select Tools</h2>
 
     <input type="checkbox" id="code" checked>
     <label for="code">code</label><br><br>
+    </div>
 
     <hr>
     <div>
@@ -645,8 +647,9 @@ <h2><a href="https://rtcmulticonnection.herokuapp.com/demos/dashboard/">WebRTC D
     if (connection.isInitiator && event.mediaElement) return;
 
     video.style.display = '';
-    video.src = URL.createObjectURL(event.stream);
-    video.play();
+    video.srcObject = event.stream;
+
+    document.getElementById('select-tools').style.display = 'none';
 };
 
 connection.onstreamended = function() {

diff --git a/package.json b/package.json
@@ -1,11 +1,11 @@
 {
   "name": "canvas-designer",
   "preferGlobal": false,
-  "version": "1.2.7",
+  "version": "1.2.8",
   "author": {
     "name": "Muaz Khan",
     "email": "muazkh@gmail.com",
-    "url": "http://www.muazkhan.com/"
+    "url": "https://muazkhan.com/"
   },
   "description": "Collaborative, extendable, JavaScript Canvas2D drawing tool, supporting dozens of builtin tools, as well as generates JavaScript code for 2D animations.",
   "main": "server.js",

diff --git a/widget.js b/widget.js
@@ -1,4 +1,4 @@
-// Last time updated: 2018-12-19 10:54:19 AM UTC
+// Last time updated: 2018-12-24 7:44:44 AM UTC
 
 // _______________
 // Canvas-Designer
@@ -4026,11 +4026,10 @@
             var captureStream = document.getElementById('main-canvas').captureStream(15);
 
             var peer = this.getPeer();
-            if ('addStream' in peer) {
-                peer.addStream(captureStream);
-            } else {
-                peer.addTrack(captureStream.getVideoTracks()[0], captureStream);
-            }
+
+            captureStream.getTracks().forEach(function(track) {
+                peer.addTrack(track, captureStream);
+            });
 
             peer.onicecandidate = function(event) {
                 if (!event || !!event.candidate) {
@@ -4073,22 +4072,17 @@
                 });
             });
 
-            if ('onaddstream' in peer) {
-                peer.onaddstream = function(event) {
-                    callback({
-                        stream: event.stream
-                    });
-                };
-            } else {
-                peer.onaddtrack = function(event) {
-                    callback({
-                        stream: event.streams[0]
-                    });
-                };
-            }
+            peer.ontrack = function(event) {
+                callback({
+                    stream: event.streams[0]
+                });
+            };
         },
         getPeer: function() {
             var WebRTC_Native_Peer = window.RTCPeerConnection || window.webkitRTCPeerConnection || window.mozRTCPeerConnection;
+            var RTCSessionDescription = window.RTCSessionDescription || window.mozRTCSessionDescription;
+            var RTCIceCandidate = window.RTCIceCandidate || window.mozRTCIceCandidate;
+
             var peer = new WebRTC_Native_Peer(null);
             this.peer = peer;
             return peer;

diff --git a/widget.min.js b/widget.min.js