@xibosignage/xibo-layout-renderer 1.0.13 → 1.0.14

package/dist/xibo-layout-renderer.esm.js

@@ -73133,7 +73133,7 @@ function Media(region, mediaId, xml, options, xlr) {
                 $media = getNewMedia();
               }
               if (!$media) {
-                _context2.next = 40;
+                _context2.next = 39;
                 break;
               }
               $media.style.setProperty('display', 'block');
@@ -73162,48 +73162,46 @@ function Media(region, mediaId, xml, options, xlr) {
               _context2.t3 = _context2.t2;
               _context2.t4 = _context2.t1.concat.call(_context2.t1, _context2.t3);
               _context2.t0.setProperty.call(_context2.t0, 'background-image', _context2.t4);
-              _context2.next = 39;
+              _context2.next = 38;
               break;
             case 22:
               if (!(self.mediaType === 'video' && self.url !== null)) {
-                _context2.next = 27;
+                _context2.next = 26;
                 break;
               }
               // Initialize video.js
-              videojs($media, {
+              self.player = videojs($media, {
                 controls: false,
                 preload: 'auto',
                 autoplay: false,
                 muted: self.muted,
                 errorDisplay: xlr.config.platform !== 'chromeOS',
-                restoreEl: $media,
                 loop: self.loop
               });
-              self.player = videojs($media);
-              _context2.next = 39;
+              _context2.next = 38;
               break;
-            case 27:
+            case 26:
               if (!(self.mediaType === 'audio' && self.url !== null)) {
-                _context2.next = 38;
+                _context2.next = 37;
                 break;
               }
               if (!isCMS) {
-                _context2.next = 34;
+                _context2.next = 33;
                 break;
               }
-              _context2.next = 31;
+              _context2.next = 30;
               return preloadMediaBlob(self.url, self.mediaType);
-            case 31:
+            case 30:
               _context2.t5 = _context2.sent;
-              _context2.next = 35;
+              _context2.next = 34;
               break;
-            case 34:
+            case 33:
               _context2.t5 = self.url;
-            case 35:
+            case 34:
               $media.src = _context2.t5;
-              _context2.next = 39;
+              _context2.next = 38;
               break;
-            case 38:
+            case 37:
               if ((self.render === 'html' || self.mediaType === 'webpage') && self.iframe && self.checkIframeStatus) {
                 // Set state as false ( for now )
                 self.ready = false;
@@ -73219,9 +73217,9 @@ function Media(region, mediaId, xml, options, xlr) {
                 //     }
                 // });
               }
-            case 39:
+            case 38:
               self.emitter.emit('start', self);
-            case 40:
+            case 39:
             case "end":
               return _context2.stop();
           }
@@ -73283,6 +73281,9 @@ function Region(layout, xml, regionId, options, xlr) {
     self.complete = false;
     self.ending = false;
     self.ended = false;
+    self.curMedia = undefined;
+    self.nxtMedia = undefined;
+    self.currentMediaIndex = 0;
     self.id = props.regionId;
     self.uniqueId = "".concat(nextId(self.options));
     self.options = _objectSpread2(_objectSpread2({}, platform), props.options);
@@ -74570,9 +74571,7 @@ function XiboLayoutRenderer(inputLayouts, options) {
           console.debug('prepareLayouts::xlr>layouts', self.layouts);
           return _context3.abrupt("return", new Promise(function (resolve) {
             layouts.map(function (layoutItem) {
-              if (!Boolean(self.layouts[layoutItem.index])) {
-                self.layouts[layoutItem.index] = layoutItem;
-              }
+              self.layouts[layoutItem.index] = layoutItem;
             });
             self.currentLayoutIndex = xlrLayouts.currentLayoutIndex;
             self.currentLayout = self.layouts[self.currentLayoutIndex];