Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
muaz-khan committed Jun 15, 2019
1 parent dd559f4 commit bd6e9a6
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 13 deletions.
9 changes: 4 additions & 5 deletions MultiStreamsMixer.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Last time updated: 2019-06-15 12:37:26 AM UTC
// Last time updated: 2019-06-15 1:07:23 AM UTC

// ________________________
// MultiStreamsMixer v1.0.9
// MultiStreamsMixer v1.2.0

// Open-Sourced: https://github.com/muaz-khan/MultiStreamsMixer

Expand Down Expand Up @@ -62,7 +62,8 @@ function MultiStreamsMixer(arrayOfMediaStreams, elementClass) {
drawImage: function() {},
toDataURL: function() {
return '';
}
},
style: {}
};
return obj;
};
Expand Down Expand Up @@ -117,8 +118,6 @@ function MultiStreamsMixer(arrayOfMediaStreams, elementClass) {
canvas.style.zIndex = -1;
canvas.style.top = '-1000em';
canvas.style.left = '-1000em';
canvas.style.marginTop = '-1000em';
canvas.style.marginLeft = '-1000em';
canvas.className = elementClass;
(document.body || document.documentElement).appendChild(canvas);

Expand Down
6 changes: 3 additions & 3 deletions MultiStreamsMixer.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "multistreamsmixer",
"description": "Pass multiple streams (e.g. screen+camera or multiple-cameras) and get single stream.",
"version": "1.0.9",
"version": "1.2.0",
"authors": [
{
"name": "Muaz Khan",
Expand Down
3 changes: 2 additions & 1 deletion dev/amd.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ var browserFakeUserAgent = 'Fake/5.0 (FakeOS) AppleWebKit/123 (KHTML, like Gecko
drawImage: function() {},
toDataURL: function() {
return '';
}
},
style: {}
};
return obj;
};
Expand Down
2 changes: 0 additions & 2 deletions dev/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ canvas.style.position = 'absolute';
canvas.style.zIndex = -1;
canvas.style.top = '-1000em';
canvas.style.left = '-1000em';
canvas.style.marginTop = '-1000em';
canvas.style.marginLeft = '-1000em';
canvas.className = elementClass;
(document.body || document.documentElement).appendChild(canvas);

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "multistreamsmixer",
"preferGlobal": true,
"version": "1.0.9",
"version": "1.2.0",
"author": {
"name": "Muaz Khan",
"email": "[email protected]",
Expand Down

0 comments on commit bd6e9a6

Please sign in to comment.