Fixed muaz-khan#423

cfilkins · Sep 13, 2018 · d8c5e49 · d8c5e49
1 parent 576145a
commit d8c5e49
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 37 deletions.
diff --git a/Canvas-Recording/webpage-recording.html b/Canvas-Recording/webpage-recording.html
@@ -105,7 +105,7 @@ <h2>HTML5 WebPage Activity Recording using RecordRTC</h2>
     <canvas id="animation" style="position:absolute;left:0;background-color:black; width: 300px;"></canvas>
 
     <video controls style="width:33%;position:absolute;right:40%; background-color:black;" src="video.webm" loop autoplay></video>
-    <video id="camera" controls style="width:33%;position:absolute;right:100px; top:150px;background-color:black;" poster="https://encrypted-tbn2.gstatic.com/images?q=tbn:ANd9GcTaNXZNkyP2h2vTVJ6MNzQ-qjN8CkmPgtXmNwgMDm4U79frY2j4mQ"></video>
+    <video id="camera" controls style="width:33%;position:absolute;right:100px; top:150px;background-color:black;"></video>
 
     <div id="other-demo-hints">There is another demo, that allows you <a href="https://www.webrtc-experiment.com/RecordRTC/Canvas-Recording/record-canvas-drawings.html">record drawings</a>!</div>
 

diff --git a/RecordRTC.js b/RecordRTC.js
@@ -1,9 +1,9 @@
 'use strict';
 
-// Last time updated: 2018-09-12 1:14:20 PM UTC
+// Last time updated: 2018-09-13 9:12:03 AM UTC
 
 // ________________
-// RecordRTC v5.4.8
+// RecordRTC v5.4.9
 
 // Open-Sourced: https://github.com/muaz-khan/RecordRTC
 
@@ -767,7 +767,7 @@ function RecordRTC(mediaStream, config) {
          * @example
          * alert(recorder.version);
          */
-        version: '5.4.8'
+        version: '5.4.9'
     };
 
     if (!this) {
@@ -785,7 +785,7 @@ function RecordRTC(mediaStream, config) {
     return returnObject;
 }
 
-RecordRTC.version = '5.4.8';
+RecordRTC.version = '5.4.9';
 
 if (typeof module !== 'undefined' /* && !!module.exports*/ ) {
     module.exports = RecordRTC;
@@ -1855,17 +1855,17 @@ function isElectron() {
 }
 
 function setSrcObject(stream, element, ignoreCreateObjectURL) {
-    if ('createObjectURL' in URL && !ignoreCreateObjectURL) {
+    if ('srcObject' in element) {
+        element.srcObject = stream;
+    } else if ('mozSrcObject' in element) {
+        element.mozSrcObject = stream;
+    } else if ('createObjectURL' in URL && !ignoreCreateObjectURL) {
         try {
             element.src = URL.createObjectURL(stream);
         } catch (e) {
             setSrcObject(stream, element, true);
             return;
         }
-    } else if ('srcObject' in element) {
-        element.srcObject = stream;
-    } else if ('mozSrcObject' in element) {
-        element.mozSrcObject = stream;
     } else {
         alert('createObjectURL/srcObject both are not supported.');
     }

diff --git a/RecordRTC.min.js b/RecordRTC.min.js
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "recordrtc",
-  "version": "5.4.8",
+  "version": "5.4.9",
   "authors": [
         {
             "name": "Muaz Khan",

diff --git a/dev/Cross-Browser-Declarations.js b/dev/Cross-Browser-Declarations.js
@@ -234,17 +234,17 @@ function isElectron() {
 }
 
 function setSrcObject(stream, element, ignoreCreateObjectURL) {
-    if ('createObjectURL' in URL && !ignoreCreateObjectURL) {
+    if ('srcObject' in element) {
+        element.srcObject = stream;
+    } else if ('mozSrcObject' in element) {
+        element.mozSrcObject = stream;
+    } else if ('createObjectURL' in URL && !ignoreCreateObjectURL) {
         try {
             element.src = URL.createObjectURL(stream);
         } catch (e) {
             setSrcObject(stream, element, true);
             return;
         }
-    } else if ('srcObject' in element) {
-        element.srcObject = stream;
-    } else if ('mozSrcObject' in element) {
-        element.mozSrcObject = stream;
     } else {
         alert('createObjectURL/srcObject both are not supported.');
     }

diff --git a/favicon.ico b/favicon.ico
diff --git a/index.html b/index.html
@@ -1,4 +1,4 @@
-<script>window.demoVersion = '2018.06.06';</script>
+<script>window.demoVersion = '2018.09.13';</script>
 
 <!--
 > Muaz Khan     - www.MuazKhan.com
@@ -98,8 +98,8 @@ <h1>
 
             <p style="margin:0;margin-bottom:-30px;margin-top: 15px;">
                 <a href="https://github.com/muaz-khan/RecordRTC">Github Source Codes</a> |
-                <a href="https://www.webrtc-experiment.com/RecordRTC/Canvas-Recording/">Canvas Recording</a> |
-                <a href="https://www.webrtc-experiment.com/RecordRTC/simple-demos/">Simple Demos</a>
+                <a href="Canvas-Recording/">Canvas Recording</a> |
+                <a href="simple-demos/">Simple Demos</a>
 
                 <br><br>
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "recordrtc",
   "preferGlobal": false,
-  "version": "5.4.8",
+  "version": "5.4.9",
   "author": {
     "name": "Muaz Khan",
     "email": "muazkh@gmail.com",

diff --git a/simple-demos/index.html b/simple-demos/index.html
@@ -1,4 +1,4 @@
-<script>window.demoVersion = '2018.05.22';</script>
+<script>window.demoVersion = '2018.09.13';</script>
 
 <!--
 > Muaz Khan     - www.MuazKhan.com
@@ -93,6 +93,18 @@ <h2 class="header">
             </h2>
             <table style="border-collapse: collapse; border-spacing: 0px; margin-top: 0px; margin-bottom: 16px; display: block; width: 728px; overflow: auto; word-break: normal; color: rgb(51, 51, 51); font-family: 'Helvetica Neue', Helvetica, 'Segoe UI', Arial, freesans, sans-serif; font-size: 16px; line-height: 25.6000003814697px;"><thead><tr style="border-top-width: 1px; border-top-style: solid; border-top-color: rgb(204, 204, 204);"><th style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221); text-align: left;">Experiment Name</th><th style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221);">Demo</th><th style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221);">Source</th></tr></thead>
             <tbody>
+                <tr style="border-top-width: 1px; border-top-style: solid; border-top-color: rgb(204, 204, 204); background-color: rgb(248, 248, 248);">
+                    <td style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221);">Simple Audio Recording (Supports: Edge, Safari, Firefox and Chrome)</td>
+                    <td style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221);"><a href="audio-recording.html" style="color: rgb(65, 131, 196); text-decoration: none; background: transparent;">Demo</a></td>
+                    <td style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221);"><a href="https://github.com/muaz-khan/RecordRTC/blob/master/simple-demos/audio-recording.html" style="color: rgb(65, 131, 196); text-decoration: none; background: transparent;">Source</a></td>
+                </tr>
+
+                <tr style="border-top-width: 1px; border-top-style: solid; border-top-color: rgb(204, 204, 204); background-color: rgb(248, 248, 248);">
+                    <td style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221);">Simple Video Recording</td>
+                    <td style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221);"><a href="video-recording.html" style="color: rgb(65, 131, 196); text-decoration: none; background: transparent;">Demo</a></td>
+                    <td style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221);"><a href="https://github.com/muaz-khan/RecordRTC/blob/master/simple-demos/video-recording.html" style="color: rgb(65, 131, 196); text-decoration: none; background: transparent;">Source</a></td>
+                </tr>
+
                 <tr style="border-top-width: 1px; border-top-style: solid; border-top-color: rgb(204, 204, 204); background-color: rgb(248, 248, 248);">
                     <td style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221);">ondataavailable | get Intervals based blobs</td>
                     <td style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221);"><a href="ondataavailable.html" style="color: rgb(65, 131, 196); text-decoration: none; background: transparent;">Demo</a></td>
@@ -231,18 +243,6 @@ <h2 class="header">
                     <td style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221);"><a href="https://github.com/muaz-khan/RecordRTC/blob/master/simple-demos/multi-audios-recording.html" style="color: rgb(65, 131, 196); text-decoration: none; background: transparent;">Source</a></td>
                 </tr>
 
-                <tr style="border-top-width: 1px; border-top-style: solid; border-top-color: rgb(204, 204, 204); background-color: rgb(248, 248, 248);">
-                    <td style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221);">Simple Video Recording</td>
-                    <td style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221);"><a href="video-recording.html" style="color: rgb(65, 131, 196); text-decoration: none; background: transparent;">Demo</a></td>
-                    <td style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221);"><a href="https://github.com/muaz-khan/RecordRTC/blob/master/simple-demos/video-recording.html" style="color: rgb(65, 131, 196); text-decoration: none; background: transparent;">Source</a></td>
-                </tr>
-
-                <tr style="border-top-width: 1px; border-top-style: solid; border-top-color: rgb(204, 204, 204); background-color: rgb(248, 248, 248);">
-                    <td style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221);">Simple Audio Recording (Supports: Edge, Safari, Firefox and Chrome)</td>
-                    <td style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221);"><a href="audio-recording.html" style="color: rgb(65, 131, 196); text-decoration: none; background: transparent;">Demo</a></td>
-                    <td style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221);"><a href="https://github.com/muaz-khan/RecordRTC/blob/master/simple-demos/audio-recording.html" style="color: rgb(65, 131, 196); text-decoration: none; background: transparent;">Source</a></td>
-                </tr>
-
                 <tr style="border-top-width: 1px; border-top-style: solid; border-top-color: rgb(204, 204, 204); background-color: rgb(248, 248, 248);">
                     <td style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221);">pass getUserMedia constraints to RecordRTC</td>
                     <td style="padding: 6px 13px; border: 1px solid rgb(221, 221, 221);"><a href="pass-getUserMedia-constraints.html" style="color: rgb(65, 131, 196); text-decoration: none; background: transparent;">Demo</a></td>