@xibosignage/xibo-layout-renderer 1.0.18 → 1.0.19

package/dist/xibo-layout-renderer.js

@@ -668,7 +668,8 @@ var XiboLayoutRenderer = (function (exports) {
     xlr: {},
     finishAllRegions: function finishAllRegions() {
       return Promise.resolve([]);
-    }
+    },
+    inLoop: true
   };
 
   function nextId(options) {
@@ -74144,7 +74145,7 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
     });
     emitter.on('end', /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(layout) {
-        var $layout;
+        var $layout, _$layout$parentElemen;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -74156,7 +74157,7 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
                 $layout: $layout
               });
               if ($layout !== null) {
-                $layout.remove();
+                (_$layout$parentElemen = $layout.parentElement) === null || _$layout$parentElemen === void 0 || _$layout$parentElemen.removeChild($layout);
               }
               // Check if stats are enabled for the layout
               if (layout.enableStat) {
@@ -74167,7 +74168,7 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
                   type: 'layout'
                 });
               }
-              if (xlr.config.platform !== 'CMS') {
+              if (xlr.config.platform !== 'CMS' && layout.inLoop) {
                 // Transition next layout to current layout and prepare next layout if exist
                 xlr.prepareLayouts().then(function (parent) {
                   xlr.playSchedules(parent);
@@ -74326,43 +74327,46 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
         self.end();
       }
     };
-    layoutObject.regionEnded = function () {
-      var self = layoutObject;
-      self.allEnded = true;
-      for (var i = 0; i < self.regions.length; i++) {
-        if (!self.regions[i].ended) {
-          self.allEnded = false;
-        }
-      }
-      if (self.allEnded) {
-        self.stopAllMedia().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-          var $end, $preview;
-          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-            while (1) switch (_context2.prev = _context2.next) {
-              case 0:
-                console.debug('starting to end layout . . .');
-                if (xlr.config.platform === 'CMS') {
-                  $end = document.getElementById('play_ended');
-                  $preview = document.getElementById('screen_container');
-                  if ($preview) {
-                    while ($preview.firstChild) {
-                      $preview.removeChild($preview.firstChild);
-                    }
-                    $preview.style.display = 'none';
-                  }
-                  if ($end) {
-                    $end.style.display = 'block';
-                  }
+    layoutObject.regionEnded = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var self, i, $end, $preview;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            self = layoutObject;
+            self.allEnded = true;
+            for (i = 0; i < self.regions.length; i++) {
+              if (!self.regions[i].ended) {
+                self.allEnded = false;
+              }
+            }
+            if (!self.allEnded) {
+              _context2.next = 9;
+              break;
+            }
+            _context2.next = 6;
+            return self.stopAllMedia();
+          case 6:
+            console.debug('starting to end layout . . .');
+            if (xlr.config.platform === 'CMS') {
+              $end = document.getElementById('play_ended');
+              $preview = document.getElementById('screen_container');
+              if ($preview) {
+                while ($preview.firstChild) {
+                  $preview.removeChild($preview.firstChild);
                 }
-                self.emitter.emit('end', self);
-              case 3:
-              case "end":
-                return _context2.stop();
+                $preview.style.display = 'none';
+              }
+              if ($end) {
+                $end.style.display = 'block';
+              }
             }
-          }, _callee2);
-        })));
-      }
-    };
+            self.emitter.emit('end', self);
+          case 9:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
     layoutObject.end = function () {
       console.debug('Executing Layout::end and Calling Region::end ', layoutObject);
       /* Ask the layout to gracefully stop running now */
@@ -74612,7 +74616,7 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
     xlrObject.updateLayouts = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(inputLayouts) {
         var _this2 = this;
-        var xlr, _this$currentLayout, _this$nextLayout, currLayoutIndex, nxtLayoutIndex, tempOldNxtLayout, newNxtLayoutIndex, tempNxtLayout, hasOldNxtLayout, oldNxtLayoutIndex, _this$nextLayout2, tempNewNxtLayout;
+        var _this$currentLayout, xlr, _this$currentLayout2, _this$nextLayout, currLayoutIndex, nxtLayoutIndex, tempOldNxtLayout, newNxtLayoutIndex, tempNxtLayout, hasOldNxtLayout, oldNxtLayoutIndex, _this$nextLayout2, tempNewNxtLayout;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -74634,39 +74638,49 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
                * Case 0: When inputLayouts length = 0
                */
               if (!(inputLayouts.length === 0)) {
-                _context2.next = 9;
+                _context2.next = 10;
                 break;
               }
               this.layouts = [];
+              if (this.currentLayout) {
+                this.currentLayout.inLoop = false;
+              }
               this.currentLayout = undefined;
               this.nextLayout = undefined;
               this.currentLayoutIndex = 0;
               this.prepareLayouts().then(function (xlr) {
                 _this2.playSchedules(xlr);
               });
-              _context2.next = 49;
+              _context2.next = 65;
               break;
-            case 9:
+            case 10:
               if (!(inputLayouts.filter(function (inputLayout) {
                 var _this2$currentLayout;
                 return inputLayout.layoutId === ((_this2$currentLayout = _this2.currentLayout) === null || _this2$currentLayout === void 0 ? void 0 : _this2$currentLayout.layoutId);
               }).length === 0)) {
-                _context2.next = 20;
+                _context2.next = 24;
                 break;
               }
               // Unset currentLayout, nextLayout and layouts
               this.layouts = [];
+              if (this.currentLayout) {
+                this.currentLayout.inLoop = false;
+              }
+              // Clean up currentLayout
+              _context2.next = 15;
+              return (_this$currentLayout = this.currentLayout) === null || _this$currentLayout === void 0 ? void 0 : _this$currentLayout.finishAllRegions();
+            case 15:
               this.currentLayout = undefined;
               this.nextLayout = undefined;
               this.currentLayoutIndex = 0;
-              _context2.next = 16;
+              _context2.next = 20;
               return this.prepareLayouts();
-            case 16:
+            case 20:
               xlr = _context2.sent;
               this.playSchedules(xlr);
-              _context2.next = 49;
+              _context2.next = 65;
               break;
-            case 20:
+            case 24:
               /** Case 2: When currentLayout is in inputLayouts, then continue playing
                * Also check for nextLayout if in inputLayouts and same sequence, then don't change and continue playing.
                * If not in inputLayouts, then replace and prepare nextLayout.
@@ -74674,73 +74688,92 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
               // 2.1 We don't have to do anything for currentLayout
               // 2.2 Check for nextLayout
               // Get nextLayout index
-              currLayoutIndex = getIndexByLayoutId(inputLayouts, (_this$currentLayout = this.currentLayout) === null || _this$currentLayout === void 0 ? void 0 : _this$currentLayout.layoutId).index;
+              currLayoutIndex = getIndexByLayoutId(inputLayouts, (_this$currentLayout2 = this.currentLayout) === null || _this$currentLayout2 === void 0 ? void 0 : _this$currentLayout2.layoutId).index;
               nxtLayoutIndex = getIndexByLayoutId(inputLayouts, (_this$nextLayout = this.nextLayout) === null || _this$nextLayout === void 0 ? void 0 : _this$nextLayout.layoutId).index;
               tempOldNxtLayout = this.layouts[nxtLayoutIndex];
               newNxtLayoutIndex = currLayoutIndex + 1;
               if (!(nxtLayoutIndex !== newNxtLayoutIndex)) {
-                _context2.next = 42;
+                _context2.next = 54;
                 break;
               }
               // Delete old nextLayout
               delete this.layouts[nxtLayoutIndex];
               if (!Boolean(this.layouts[newNxtLayoutIndex])) {
-                _context2.next = 31;
+                _context2.next = 35;
                 break;
               }
               this.nextLayout = this.layouts[newNxtLayoutIndex];
               this.layouts[newNxtLayoutIndex] = this.nextLayout;
-              _context2.next = 40;
+              _context2.next = 52;
               break;
-            case 31:
+            case 35:
               // Check if newNxtLayoutIndex is still within inputLayouts
               if (newNxtLayoutIndex + 1 > inputLayouts.length) {
                 // Goes back to first layout in the sequence
                 newNxtLayoutIndex = 0;
               }
               if (!Boolean(inputLayouts[newNxtLayoutIndex])) {
-                _context2.next = 38;
+                _context2.next = 42;
                 break;
               }
               tempNxtLayout = _objectSpread2(_objectSpread2({}, initialLayout), inputLayouts[newNxtLayoutIndex]);
-              _context2.next = 36;
+              _context2.next = 40;
               return this.prepareLayoutXlf(tempNxtLayout);
-            case 36:
+            case 40:
               this.nextLayout = _context2.sent;
               this.layouts[newNxtLayoutIndex] = this.nextLayout;
-            case 38:
+            case 42:
               // Move old nextLayout to its index
               hasOldNxtLayout = inputLayouts.filter(function (_layout) {
                 return _layout.layoutId === (tempOldNxtLayout === null || tempOldNxtLayout === void 0 ? void 0 : tempOldNxtLayout.layoutId);
               });
-              if (hasOldNxtLayout.length === 1) {
-                oldNxtLayoutIndex = getIndexByLayoutId(inputLayouts, hasOldNxtLayout[0].layoutId).index;
-                this.layouts[oldNxtLayoutIndex] = tempOldNxtLayout;
+              if (!(hasOldNxtLayout.length === 1)) {
+                _context2.next = 48;
+                break;
               }
-            case 40:
-              _context2.next = 49;
+              oldNxtLayoutIndex = getIndexByLayoutId(inputLayouts, hasOldNxtLayout[0].layoutId).index;
+              this.layouts[oldNxtLayoutIndex] = tempOldNxtLayout;
+              _context2.next = 52;
               break;
-            case 42:
+            case 48:
+              if (!tempOldNxtLayout) {
+                _context2.next = 52;
+                break;
+              }
+              _context2.next = 51;
+              return tempOldNxtLayout.finishAllRegions();
+            case 51:
+              delete this.layouts[tempOldNxtLayout.index];
+            case 52:
+              _context2.next = 65;
+              break;
+            case 54:
               if (!(inputLayouts[nxtLayoutIndex].layoutId !== ((_this$nextLayout2 = this.nextLayout) === null || _this$nextLayout2 === void 0 ? void 0 : _this$nextLayout2.layoutId))) {
-                _context2.next = 48;
+                _context2.next = 60;
                 break;
               }
               tempNewNxtLayout = _objectSpread2(_objectSpread2({}, initialLayout), inputLayouts[nxtLayoutIndex]);
-              _context2.next = 46;
+              _context2.next = 58;
               return this.prepareLayoutXlf(tempNewNxtLayout);
-            case 46:
+            case 58:
               this.nextLayout = _context2.sent;
               this.layouts[nxtLayoutIndex] = this.nextLayout;
-            case 48:
-              // Remove old nextLayout if it's not in inputLayouts
-              if (tempOldNxtLayout !== null && tempOldNxtLayout !== void 0 && tempOldNxtLayout.index && Boolean(this.layouts[tempOldNxtLayout === null || tempOldNxtLayout === void 0 ? void 0 : tempOldNxtLayout.index])) {
-                if (inputLayouts.filter(function (_layout) {
-                  return _layout.layoutId === (tempOldNxtLayout === null || tempOldNxtLayout === void 0 ? void 0 : tempOldNxtLayout.layoutId);
-                }).length === 0) {
-                  delete this.layouts[tempOldNxtLayout === null || tempOldNxtLayout === void 0 ? void 0 : tempOldNxtLayout.index];
-                }
+            case 60:
+              if (!(tempOldNxtLayout !== null && tempOldNxtLayout !== void 0 && tempOldNxtLayout.index && Boolean(this.layouts[tempOldNxtLayout === null || tempOldNxtLayout === void 0 ? void 0 : tempOldNxtLayout.index]))) {
+                _context2.next = 65;
+                break;
+              }
+              if (!(inputLayouts.filter(function (_layout) {
+                return _layout.layoutId === (tempOldNxtLayout === null || tempOldNxtLayout === void 0 ? void 0 : tempOldNxtLayout.layoutId);
+              }).length === 0)) {
+                _context2.next = 65;
+                break;
               }
-            case 49:
+              _context2.next = 64;
+              return tempOldNxtLayout.finishAllRegions();
+            case 64:
+              delete this.layouts[tempOldNxtLayout === null || tempOldNxtLayout === void 0 ? void 0 : tempOldNxtLayout.index];
+            case 65:
             case "end":
               return _context2.stop();
           }
@@ -74851,7 +74884,7 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
     }();
     xlrObject.gotoPrevLayout = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       var _this4 = this;
-      var _currentLayoutIndex, _assumedPrevIndex, _this$currentLayout2;
+      var _currentLayoutIndex, _assumedPrevIndex, _this$currentLayout3;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -74873,7 +74906,7 @@ ${segmentInfoString(segmentInfo)}`); // If there's an init segment associated wi
               break;
             }
             _context5.next = 8;
-            return (_this$currentLayout2 = this.currentLayout) === null || _this$currentLayout2 === void 0 ? void 0 : _this$currentLayout2.finishAllRegions();
+            return (_this$currentLayout3 = this.currentLayout) === null || _this$currentLayout3 === void 0 ? void 0 : _this$currentLayout3.finishAllRegions();
           case 8:
             // and set the previous layout as current layout
             this.currentLayoutIndex = _assumedPrevIndex;