videomail-client 9.5.1 → 9.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "videomail-client",
-  "version": "9.5.1",
+  "version": "9.5.4",
   "description": "A wicked npm package to record videos directly in the browser, wohooo!",
   "keywords": [
     "webcam",

package/prototype/js/videomail-client.js

@@ -16907,7 +16907,7 @@ function wrappy (fn, cb) {
 },{}],112:[function(_dereq_,module,exports){
 module.exports={
   "name": "videomail-client",
-  "version": "9.5.1",
+  "version": "9.5.4",
   "description": "A wicked npm package to record videos directly in the browser, wohooo!",
   "keywords": [
     "webcam",
@@ -17118,7 +17118,7 @@ var VideomailClient = function VideomailClient(options) {
       container.showReplayOnly();
     });
     var replay = container.getReplay();
-    replay.setVideomail(videomail);
+    replay.setVideomail(videomail, true);
   };
   this.startOver = function (params) {
     var replay = container.getReplay();
@@ -20615,7 +20615,7 @@ var Visuals = function Visuals(container, options) {
   function buildChildren() {
     var playerOnly = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     var replayParentElement = arguments.length > 1 ? arguments[1] : undefined;
-    debug("Visuals: buildChildren (playerOnly = ".concat(playerOnly).concat(replayParentElement ? ", replayParentElement=\"".concat(replayParentElement, "\"") : "", ")"));
+    debug("Visuals: buildChildren (playerOnly = ".concat(playerOnly).concat(replayParentElement ? ", replayParentElement=\"".concat(replayParentElement.id, "\"") : "", ")"));
     buildNoScriptTag();
     if (!playerOnly) {
       notifier.build();
@@ -20685,20 +20685,27 @@ var Visuals = function Visuals(container, options) {
   this.build = function () {
     var playerOnly = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     var replayParentElement = arguments.length > 1 ? arguments[1] : undefined;
+    debug("Visuals: build (playerOnly=".concat(playerOnly, ")"));
     if (container) {
       visualsElement = container.querySelector(".".concat(options.selectors.visualsClass));
       if (!visualsElement) {
-        visualsElement = (0, _hyperscript.default)("div.".concat(options.selectors.visualsClass));
-        var buttonsElement = container.querySelector(".".concat(options.selectors.buttonsClass));
-
-        /*
-         * Make sure it's placed before the buttons, but only if it's a child
-         * element of the container = inside the container
-         */
-        if (buttonsElement && !container.isOutsideElementOf(buttonsElement)) {
-          container.insertBefore(visualsElement, buttonsElement);
+        if (playerOnly && replayParentElement) {
+          visualsElement = replayParentElement;
         } else {
-          container.appendChild(visualsElement);
+          visualsElement = (0, _hyperscript.default)("div.".concat(options.selectors.visualsClass));
+        }
+        if (!playerOnly) {
+          var buttonsElement = container.querySelector(".".concat(options.selectors.buttonsClass));
+
+          /*
+           * Make sure it's placed before the buttons, but only if it's a child
+           * element of the container = inside the container
+           */
+          if (buttonsElement && !container.isOutsideElementOf(buttonsElement)) {
+            container.insertBefore(visualsElement, buttonsElement);
+          } else {
+            container.appendChild(visualsElement);
+          }
         }
       }
 
@@ -20741,6 +20748,7 @@ var Visuals = function Visuals(container, options) {
       cb = params;
       params = {};
     }
+    debug("Visuals: back(".concat(params ? (0, _safeJsonStringify.default)(params) : "", ")"));
     replay.hide();
     notifier.hide();
     if (params && params.keepHidden) {
@@ -20773,6 +20781,12 @@ var Visuals = function Visuals(container, options) {
       recorder.unload(e);
       recorderInsides.unload(e);
       replay.unload();
+      if (e instanceof Error) {
+        // Don't hide when e is an error so that the error can be still
+        // displayed under visuals > notifier
+      } else {
+        this.hide();
+      }
       built = false;
     } catch (exc) {
       this.emit(_events.default.ERROR, exc);
@@ -20859,15 +20873,17 @@ var Visuals = function Visuals(container, options) {
     }
   };
   this.showVisuals = function () {
-    visualsElement && (0, _hidden.default)(visualsElement, false);
+    (0, _hidden.default)(visualsElement, false);
   };
   this.show = function () {
-    !this.isReplayShown() && visualsElement && recorder.build();
+    var playerOnly = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+    if (!playerOnly && !this.isReplayShown()) {
+      recorder.build();
+    }
     this.showVisuals();
   };
   this.showReplayOnly = function () {
-    replay.show();
-    this.show();
+    this.show(true);
     recorder.hide();
     notifier.hide();
   };
@@ -21388,6 +21404,7 @@ var Notifier = function Notifier(visuals, options) {
   var self = this;
   var debug = options && options.debug;
   var notifyElement;
+  var messageElement;
   var explanationElement;
   var entertainTimeoutId;
   var entertaining;
@@ -21421,7 +21438,7 @@ var Notifier = function Notifier(visuals, options) {
     } else {
       overallProgress = frameProgress;
     }
-    self.setExplanation(overallProgress);
+    setExplanation(overallProgress);
   }
   function onBeginVideoEncoding() {
     visuals.beginWaiting();
@@ -21493,21 +21510,6 @@ var Notifier = function Notifier(visuals, options) {
     entertainTimeoutId = null;
     entertaining = false;
   }
-  function setMessage(message, messageOptions) {
-    var notifierMessage = getNotifierMessage();
-    if (notifierMessage) {
-      options.debug("Notifier: setMessage(".concat(message, ")"));
-      if (message.length > 0) {
-        var problem = messageOptions.problem ? messageOptions.problem : false;
-        notifierMessage.innerHTML = (problem ? "☹ " : "") + message;
-      } else {
-        options.logger.warn("Not going to update notifierMessage element because message is empty", message);
-      }
-      (0, _hidden.default)(notifierMessage, false);
-    } else {
-      // Must be unloaded, do nothing further
-    }
-  }
   this.error = function (err) {
     var message = err.message ? err.message.toString() : err.toString();
     var explanation = err.explanation ? err.explanation.toString() : null;
@@ -21522,7 +21524,33 @@ var Notifier = function Notifier(visuals, options) {
       removeDimensions: err.removeDimensions && err.removeDimensions()
     });
   };
-  this.setExplanation = function (explanation) {
+  function setMessage(message, messageOptions) {
+    options.debug("Notifier: setMessage(".concat(message, ")"));
+    if (!messageElement) {
+      messageElement = (0, _hyperscript.default)("h2", {
+        id: NOTIFIER_MESSAGE_ID
+      });
+      if (notifyElement) {
+        if (messageElement && explanationElement) {
+          // For rare cases, shouldn't happen to set an explanation without a message
+          notifyElement.insertBefore(messageElement, explanationElement);
+        } else {
+          notifyElement.appendChild(messageElement);
+        }
+      } else {
+        options.logger.warn("Unable to show message ".concat(message, " because notifyElement is empty"));
+      }
+    }
+    if (message.length > 0) {
+      var problem = messageOptions.problem ? messageOptions.problem : false;
+      messageElement.innerHTML = (problem ? "☹ " : "") + message;
+    } else {
+      options.logger.warn("Not going to update notifierMessage element because message is empty");
+    }
+    (0, _hidden.default)(messageElement, false);
+  }
+  function setExplanation(explanation) {
+    options.debug("Notifier: setExplanation(".concat(explanation, ")"));
     if (!explanationElement) {
       explanationElement = (0, _hyperscript.default)("p", {
         className: "explanation"
@@ -21535,7 +21563,7 @@ var Notifier = function Notifier(visuals, options) {
     }
     explanationElement.innerHTML = explanation;
     (0, _hidden.default)(explanationElement, false);
-  };
+  }
   this.build = function () {
     options.debug("Notifier: build()");
     notifyElement = visuals.querySelector(".notifier");
@@ -21551,9 +21579,8 @@ var Notifier = function Notifier(visuals, options) {
     built = true;
   };
   function hideMessage() {
-    var notifierMessage = getNotifierMessage();
-    if (notifierMessage) {
-      (0, _hidden.default)(notifierMessage, true);
+    if (messageElement) {
+      (0, _hidden.default)(messageElement, true);
     }
   }
   function hideExplanation() {
@@ -21579,9 +21606,6 @@ var Notifier = function Notifier(visuals, options) {
   this.isBuilt = function () {
     return built;
   };
-  function getNotifierMessage() {
-    return document.getElementById(NOTIFIER_MESSAGE_ID);
-  }
   this.notify = function (message, explanation) {
     var notifyOptions = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     var params = [message, explanation].filter(Boolean);
@@ -21592,17 +21616,6 @@ var Notifier = function Notifier(visuals, options) {
     var hideForm = notifyOptions.hideForm ? notifyOptions.hideForm : false;
     var classList = notifyOptions.classList ? notifyOptions.classList : false;
     var removeDimensions = notifyOptions.removeDimensions ? notifyOptions.removeDimensions : false;
-    var notifierMessage = getNotifierMessage();
-    if (!notifierMessage && notifyElement) {
-      var messageElement = (0, _hyperscript.default)("h2", {
-        id: NOTIFIER_MESSAGE_ID
-      });
-      notifyElement.appendChild(messageElement);
-    }
-    notifierMessage = getNotifierMessage();
-    if (notifyElement && notifierMessage && explanationElement) {
-      notifyElement.insertBefore(notifierMessage, explanationElement);
-    }
     if (notifyElement) {
       // reset
       if (!entertain) {
@@ -21630,7 +21643,7 @@ var Notifier = function Notifier(visuals, options) {
     visuals.hideRecorder();
     setMessage(message, notifyOptions);
     if (explanation && explanation.length > 0) {
-      this.setExplanation(explanation);
+      setExplanation(explanation);
     }
     if (entertain) {
       runEntertainment();
@@ -22352,8 +22365,8 @@ var Recorder = function Recorder(visuals, replay) {
   };
   this.back = function (cb) {
     this.emit(_events.default.GOING_BACK);
+    unloaded = false;
     show();
-    this.reset();
     writeCommand("back", cb);
   };
   function reInitializeAudio() {
@@ -22839,7 +22852,6 @@ var Replay = function Replay(parentElement, options) {
   var videomail;
   function buildElement() {
     var replayParentElement = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : parentElement;
-    replayElement = (0, _hyperscript.default)("video.".concat(options.selectors.replayClass));
     if (typeof replayParentElement === "string") {
       replayParentElement = document.getElementById(replayParentElement);
       if (!replayParentElement) {