Skip to content

Commit

Permalink
Merge branch 'release/9.5.11'
Browse files Browse the repository at this point in the history
* release/9.5.11:
  Final commit of version 9.5.11
  fix replay bugs and bump
  • Loading branch information
binarykitchen committed Oct 7, 2024
2 parents 27d0063 + 0a85f38 commit 7cd9b43
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 17 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "videomail-client",
"version": "9.5.8",
"version": "9.5.10",
"description": "A wicked npm package to record videos directly in the browser, wohooo!",
"keywords": [
"webcam",
Expand Down
6 changes: 4 additions & 2 deletions prototype/correct_existing_videomail.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
margin: 1em 0;
display: block;
}
#videomail,
#videomail .visuals,
#email {
float: left;
}
Expand All @@ -27,7 +27,9 @@
</head>
<body>
<h1>A form to correct an existing videomail</h1>
<div id="videomail"></div>
<div id="videomail">
<div class="visuals" />
</div>
<form id="email">
<fieldset>
<input name="key" value="" type="hidden" />
Expand Down
14 changes: 10 additions & 4 deletions prototype/js/videomail-client.js
Original file line number Diff line number Diff line change
Expand Up @@ -16434,7 +16434,7 @@ function wrappy (fn, cb) {
},{}],110:[function(_dereq_,module,exports){
module.exports={
"name": "videomail-client",
"version": "9.5.9",
"version": "9.5.11",
"description": "A wicked npm package to record videos directly in the browser, wohooo!",
"keywords": [
"webcam",
Expand Down Expand Up @@ -19276,7 +19276,9 @@ var Container = function Container(options) {
}
}
!built && initEvents(buildOptions.playerOnly);
correctDimensions();
if (!buildOptions.playerOnly) {
correctDimensions();
}

// Building form also applies for when `playerOnly` because of
// correcting mode on Videomail. This function will skip if there is no form. Easy.
Expand Down Expand Up @@ -20199,7 +20201,11 @@ var Visuals = function Visuals(container, options) {
var replayParentElement = arguments.length > 1 ? arguments[1] : undefined;
debug("Visuals: build (playerOnly=".concat(playerOnly, ")"));
if (container) {
visualsElement = container.querySelector(".".concat(options.selectors.visualsClass));
if (replayParentElement) {
visualsElement = replayParentElement.querySelector(".".concat(options.selectors.visualsClass));
} else {
visualsElement = container.querySelector(".".concat(options.selectors.visualsClass));
}
if (!visualsElement) {
if (playerOnly && replayParentElement) {
visualsElement = replayParentElement;
Expand Down Expand Up @@ -20227,7 +20233,7 @@ var Visuals = function Visuals(container, options) {
}
correctDimensions();
!built && initEvents(playerOnly);
buildChildren(playerOnly, replayParentElement);
buildChildren(playerOnly, visualsElement || replayParentElement);
built = true;
};
this.querySelector = function (selector) {
Expand Down
8 changes: 4 additions & 4 deletions prototype/js/videomail-client.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion prototype/js/videomail-client.min.js.map

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion src/wrappers/container.js
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,9 @@ const Container = function (options) {

!built && initEvents(buildOptions.playerOnly);

correctDimensions();
if (!buildOptions.playerOnly) {
correctDimensions();
}

// Building form also applies for when `playerOnly` because of
// correcting mode on Videomail. This function will skip if there is no form. Easy.
Expand Down
10 changes: 8 additions & 2 deletions src/wrappers/visuals.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,13 @@ const Visuals = function (container, options) {
debug(`Visuals: build (playerOnly=${playerOnly})`);

if (container) {
visualsElement = container.querySelector(`.${options.selectors.visualsClass}`);
if (replayParentElement) {
visualsElement = replayParentElement.querySelector(
`.${options.selectors.visualsClass}`,
);
} else {
visualsElement = container.querySelector(`.${options.selectors.visualsClass}`);
}

if (!visualsElement) {
if (playerOnly && replayParentElement) {
Expand Down Expand Up @@ -165,7 +171,7 @@ const Visuals = function (container, options) {
correctDimensions();

!built && initEvents(playerOnly);
buildChildren(playerOnly, replayParentElement);
buildChildren(playerOnly, visualsElement || replayParentElement);

built = true;
};
Expand Down

0 comments on commit 7cd9b43

Please sign in to comment.