boomack 0.12.0 → 0.13.0

package/client/public/css/main.css

@@ -386,10 +386,12 @@ iframe.isolated-slot-content {
 }
 .slot.content-scale .slot-content {
 	width: 100%;
+	overflow-x: hidden;
 	height: auto;
 }
 .layout-grid .slot.content-scale .slot-content {
 	height: 100%;
+	overflow-y: hidden;
 }
 .slot.content-scale .slot-content > img,
 .slot.content-scale .slot-content > video

package/client/public/js/client.js

@@ -188,7 +188,7 @@ window.boomack = window.boomack || {};
 			} catch (err) {
 				console.log("Presistent slot resize handler on '" + slotId + "' threw", err);
 			}
-		})
+		});
 		_.forEach(slotResizeHandlers[slotId], handler => {
 			try {
 				handler(size, zoomedSize);
@@ -276,12 +276,16 @@ window.boomack = window.boomack || {};
 		return $(`.slot:not(#slot-${slotId})`);
 	}
 
-	function notifySlotContent(slotE, cmd) {
-		slotE.removeClass('empty');
-		slotE.find('.slot-toolbar .cmd-clear').removeClass('disabled');
-		setData(slotE, 'ts', cmd.ts);
-		setData(slotE, 'sequence-no', cmd.no);
-		setData(slotE, 'max-sequence-no', cmd.no);
+	function notifySlotContent(slotE, cmd, { visible, repetition }) {
+		if (visible) {
+			slotE.removeClass('empty');
+			slotE.find('.slot-toolbar .cmd-clear').removeClass('disabled');
+			setData(slotE, 'ts', cmd.ts);
+			setData(slotE, 'sequence-no', cmd.no);
+		}
+		if (!repetition) {
+			setData(slotE, 'max-sequence-no', cmd.no);
+		}
 		updateHistoryButtons(slotE, cmd.no);
 	}
 
@@ -334,6 +338,8 @@ window.boomack = window.boomack || {};
 				const histSize = Math.min(maxSequenceNo, history + 1);
 				if (maxSequenceNo < 1 || histSize < 1) {
 					txtHistoryE.html('&ndash;&nbsp;/&nbsp;&ndash;');
+				} else if (maxSequenceNo - sequenceNo >= histSize) {
+					txtHistoryE.html('&ndash;&nbsp;/&nbsp;' + histSize);
 				} else {
 					txtHistoryE.html(pos + '&nbsp;/&nbsp;' + histSize);
 				}
@@ -351,7 +357,7 @@ window.boomack = window.boomack || {};
 		let count = 0;
 		for (let i = 0; i < childNodes.length; i++) {
 			const n = childNodes[i];
-			if (n.nodeType == Node.COMMENT_NODE && n.textContent == CONTENT_SEPARATOR_TEXT) {
+			if (n.nodeType === Node.COMMENT_NODE && n.textContent === CONTENT_SEPARATOR_TEXT) {
 				count++;
 			}
 		}
@@ -373,8 +379,13 @@ window.boomack = window.boomack || {};
 	}
 
 	function incrementExtensionsCount(slotId, slotE, contentE) {
-		const count = getExtensionsCount(slotId, slotE, contentE);
-		updateExtensionsCount(slotId, slotE, count + 1);
+		let count = extensionCounts[slotId];
+		if (count === undefined) {
+			count = countExtensions(contentE);
+			updateExtensionsCount(slotId, slotE, count);
+		} else {
+			updateExtensionsCount(slotId, slotE, count + 1);
+		}
 	}
 
 	function updateVersion(slotE, version) {
@@ -385,9 +396,9 @@ window.boomack = window.boomack || {};
 		let count = getExtensionsCount(slotId, slotE, contentE);
 		const contentN = contentE[0];
 		if (extend !== 'end' && extend !== 'begin') return;
-		while (count - 1 > limit) {
+		while (count > limit) {
 			const n = extend === 'begin' ? contentN.lastChild : contentN.firstChild;
-			if (n.nodeType == Node.COMMENT_NODE && n.textContent == CONTENT_SEPARATOR_TEXT) {
+			if (n.nodeType === Node.COMMENT_NODE && n.textContent === CONTENT_SEPARATOR_TEXT) {
 				count--;
 			}
 			contentN.removeChild(n);
@@ -411,7 +422,12 @@ window.boomack = window.boomack || {};
 		slotE.find('.slot-content-box')
 			.each(function () { this.style = {}; })
 			.find('.slot-content-wrapper')
-			.each(function () { this.style = {}; })
+			.each(function () {
+				// preserve the filter from the slot configuration
+				var oldFilter = this.style.filter;
+				this.style = {};
+				this.style.filter = oldFilter;
+			})
 			.find('.slot-content')
 			.each(function () { this.style = {}; });
 	}
@@ -444,9 +460,8 @@ window.boomack = window.boomack || {};
 		}
 		setData(slotE, 'scale', cmd.scale);
 		setData(slotE, 'align', cmd.align);
-		updateSlotZoom(slotE);
 		const contentBox = slotE.find('.slot-content-box');
-		contentBox.css('background', cmd.background || '');
+		contentBox.css('background', cmd.background ? replaceThemeProps(cmd.background) : '');
 		const contentWrapperE = slotE.find('.slot-content-wrapper');
 		const contentE = slotE.find('.slot-content');
 		const iframeE = slotE.find('iframe.isolated-slot-content');
@@ -461,6 +476,7 @@ window.boomack = window.boomack || {};
 			updateContentElement(slotE, cmd);
 			contentWrapperE.show();
 		}
+		updateSlotZoom(slotE);
 	}
 
 	let socket = null;
@@ -498,7 +514,7 @@ window.boomack = window.boomack || {};
 	}
 
 	function displayMediaItem(envelope) {
-		if (!checkSerialNumber(envelope.sn)) return;
+		if (!envelope.repetition && !checkSerialNumber(envelope.sn)) return;
 		if (envelope.newSlot) {
 			const newSlotE = $(envelope.newSlot);
 			const index = newSlotE.data('index');
@@ -522,14 +538,14 @@ window.boomack = window.boomack || {};
 				// handle race condition of extensions
 				if (cmd.version <= Number.parseInt(slotE.data('version'))) return;
 			}
-			if (slotE.hasClass('paused')) {
-				notifySlotContent(slotE, cmd);
+			if (!envelope.repetition && slotE.hasClass('paused')) {
+				notifySlotContent(slotE, cmd, { visible: false, repetition: envelope.repetition });
 				return;
 			}
 			const titleE = slotE.find('.txt-title');
 			titleE.html(cmd.title || '');
-			notifySlotContent(slotE, cmd);
 			clearSlotResizeHandlers(slotE.data('slot-id'));
+			notifySlotContent(slotE, cmd, { visible: true, repetition: envelope.repetition });
 			const extensionLimit = Number.parseInt(slotE.data('extension-limit') || 0);
 			if (!empty && cmd.extend == 'begin') {
 				contentE.prepend(cmd.content + '<!--' + CONTENT_SEPARATOR_TEXT + '-->');
@@ -739,6 +755,7 @@ window.boomack = window.boomack || {};
 			slotE.addClass('maximized');
 			cmdMaximize.removeClass('alternate');
 		}
+		window.dispatchEvent(new Event('resize'));
 	};
 
 	ctx.cmdClear = function (slotId) {
@@ -751,18 +768,7 @@ window.boomack = window.boomack || {};
 		const slotE = getSlot(slotId);
 		if (!slotE) return;
 		const no = Number.parseInt(slotE.data('sequence-no')) - 1;
-		if (!isValidHistoryNo(slotE, no)) return;
-		const titleE = slotE.find('.txt-title');
-		$.get('/panels/' + ctx.panelId + '/slots/' + slotId + '/history/' + no,
-			(displayCommand, status) => {
-				trace('History call status', status);
-				ctx.run(function () {
-					titleE.html(displayCommand.title || '');
-					showContentWithRequirements(slotE, displayCommand);
-					setData(slotE, 'sequence-no', no);
-					updateHistoryButtons(slotE);
-				});
-			}, 'json');
+		socket.emit('redisplay', ctx.panelId, slotId, no);
 	};
 
 	ctx.cmdHistoryForward = function (slotId) {
@@ -770,18 +776,7 @@ window.boomack = window.boomack || {};
 		const slotE = getSlot(slotId);
 		if (!slotE) return;
 		const no = Number.parseInt(slotE.data('sequence-no')) + 1;
-		if (!isValidHistoryNo(slotE, no)) return;
-		const titleE = slotE.find('.txt-title');
-		$.get('/panels/' + ctx.panelId + '/slots/' + slotId + '/history/' + no,
-			(displayCommand, status) => {
-				trace('History call status', status);
-				ctx.run(function () {
-					titleE.html(displayCommand.title || '');
-					showContentWithRequirements(slotE, displayCommand);
-					setData(slotE, 'sequence-no', no);
-					updateHistoryButtons(slotE);
-				});
-			}, 'json');
+		socket.emit('redisplay', ctx.panelId, slotId, no);
 	};
 
 	ctx.cmdTogglePause = function (slotId) {
@@ -793,7 +788,8 @@ window.boomack = window.boomack || {};
 			slotE.removeClass('paused');
 			cmdPause.removeClass('pause');
 			cmdPause.addClass('play');
-			socket.emit('refresh-slot', ctx.panelId, slotId);
+			const maxNo = Number.parseInt(slotE.data('max-sequence-no'));
+			socket.emit('redisplay', ctx.panelId, slotId, maxNo);
 		} else {
 			slotE.addClass('paused');
 			cmdPause.removeClass('play');

package/client/themes/blue-night/properties.json

@@ -2,6 +2,7 @@
 	"dark": true,
 	"monoColor": [0, 0, 1],
 	"saturation": 0,
+	"border-radius": 6,
 
 	"headline-font-family": "Roboto, 'Helvetica Neue', Arial, Helvetica, sans-serif",
 	"headline-font-weight": "600",