Release 2.7.3
Publish Docker Image / build-and-push (./build/Dockerfile, git.lzstealth.com/lzstealth/pulse-signage-web, web) (push) Successful in 1m15s
Publish Docker Image / build-and-push (./build/Dockerfile.player, git.lzstealth.com/lzstealth/pulse-signage-player, player) (push) Successful in 32s
Publish Docker Image / build-and-push (./build/Dockerfile, git.lzstealth.com/lzstealth/pulse-signage-web, web) (push) Successful in 1m15s
Publish Docker Image / build-and-push (./build/Dockerfile.player, git.lzstealth.com/lzstealth/pulse-signage-player, player) (push) Successful in 32s
This commit is contained in:
@@ -1652,6 +1652,31 @@ html[data-bs-theme='dark'] .template-field-card .tox .tox-collection {
|
||||
background: var(--bs-body-bg);
|
||||
}
|
||||
|
||||
.slide-image-cropper-frame.is-loading > :not(.slide-image-cropper-loading-overlay) {
|
||||
opacity: 0.22;
|
||||
filter: saturate(0.8);
|
||||
}
|
||||
|
||||
.slide-image-cropper-loading-overlay {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
z-index: 3;
|
||||
display: none;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
background: rgba(var(--bs-body-bg-rgb, 255, 255, 255), 0.72);
|
||||
backdrop-filter: blur(1px);
|
||||
}
|
||||
|
||||
.slide-image-cropper-frame.is-loading .slide-image-cropper-loading-overlay {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.slide-image-cropper-loading-spinner {
|
||||
width: 2.5rem;
|
||||
height: 2.5rem;
|
||||
}
|
||||
|
||||
.slide-image-cropper-frame img {
|
||||
display: block;
|
||||
max-width: 100%;
|
||||
@@ -1689,6 +1714,10 @@ html[data-bs-theme='dark'] .template-field-card .tox .tox-collection {
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
#slide-image-cropper-status:empty {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.slide-image-region-preview-box {
|
||||
display: grid;
|
||||
gap: 0;
|
||||
@@ -2139,10 +2168,21 @@ html[data-bs-theme='dark'] .template-field-card .tox .tox-collection {
|
||||
.template-field-actions {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
justify-content: flex-end;
|
||||
gap: 0.5rem;
|
||||
margin-left: auto;
|
||||
}
|
||||
|
||||
.template-editor-size-controls {
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.template-editor-size-controls .btn {
|
||||
min-width: 2rem;
|
||||
padding-inline: 0.45rem;
|
||||
}
|
||||
|
||||
.template-field-head strong {
|
||||
font-size: 0.95rem;
|
||||
min-width: 0;
|
||||
@@ -2221,6 +2261,14 @@ html[data-bs-theme='dark'] .template-field-card .tox .tox-collection {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.template-field-card .editor-holder[data-editor-height] {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.template-field-card .editor-holder .tox.tox-tinymce {
|
||||
height: 100% !important;
|
||||
}
|
||||
|
||||
.announcement-color-preview {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
@@ -539,6 +539,39 @@
|
||||
return true;
|
||||
}
|
||||
|
||||
function updateFontToggleRow(form) {
|
||||
if (!form) {
|
||||
return false;
|
||||
}
|
||||
|
||||
var row = form.closest ? form.closest('tr[data-font-toggle-row]') : null;
|
||||
if (!row) {
|
||||
return false;
|
||||
}
|
||||
|
||||
var enabledInput = form.querySelector('input[name="enabled"]');
|
||||
var toggleButton = form.querySelector('button[type="submit"]');
|
||||
var statusBadge = row.querySelector('[data-font-status-badge]');
|
||||
var isCurrentlyEnabled = String(row.getAttribute('data-font-enabled') || '').trim() === 'true';
|
||||
var willEnable = !isCurrentlyEnabled;
|
||||
|
||||
if (enabledInput) {
|
||||
enabledInput.value = isCurrentlyEnabled ? '0' : '1';
|
||||
}
|
||||
|
||||
if (toggleButton) {
|
||||
toggleButton.textContent = willEnable ? 'Disable' : 'Enable';
|
||||
}
|
||||
|
||||
if (statusBadge) {
|
||||
statusBadge.className = statusBadge.className.replace(/text-bg-(success|secondary)/g, willEnable ? 'text-bg-success' : 'text-bg-secondary');
|
||||
statusBadge.textContent = willEnable ? 'Enabled' : 'Disabled';
|
||||
}
|
||||
|
||||
row.setAttribute('data-font-enabled', willEnable ? 'true' : 'false');
|
||||
return true;
|
||||
}
|
||||
|
||||
document.addEventListener('submit', function (event) {
|
||||
var form = event.target;
|
||||
if (!form || !form.hasAttribute || !form.hasAttribute('data-async-command')) {
|
||||
@@ -584,6 +617,15 @@
|
||||
body: body.toString(),
|
||||
credentials: 'same-origin'
|
||||
}).then(function (response) {
|
||||
if (!response || Number(response.status) >= 400) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (/^\/settings\/fonts\/[^/]+\/toggle$/.test(actionPath)) {
|
||||
updateFontToggleRow(form);
|
||||
return;
|
||||
}
|
||||
|
||||
if (shouldReloadAfterSuccess && response && response.ok) {
|
||||
window.location.reload();
|
||||
return;
|
||||
|
||||
@@ -207,6 +207,12 @@
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'<div class="card-body p-3 d-grid gap-3 pb-0">' +
|
||||
'<div class="d-flex justify-content-end">' +
|
||||
'<div class="btn-group btn-group-sm template-editor-size-controls" role="group" aria-label="Editor size controls">' +
|
||||
'<button type="button" class="btn btn-outline-secondary" data-editor-size-action="decrease" aria-label="Decrease editor size">-</button>' +
|
||||
'<button type="button" class="btn btn-outline-secondary" data-editor-size-action="increase" aria-label="Increase editor size">+</button>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'<div class="editor-holder" data-region-id="' + region.id + '">' +
|
||||
'<textarea class="editor-source" rows="10">' + escapeHtml(current.value !== undefined ? current.value : '') + '</textarea>' +
|
||||
'</div>' +
|
||||
|
||||
@@ -32,8 +32,8 @@
|
||||
var regionRatio = String(context.regionRatio || '1:1');
|
||||
var uploadConfig = context.uploadConfig || {};
|
||||
var uploadMaxLabel = String(uploadConfig.limitLabel || context.uploadMaxLabel || '100 MB');
|
||||
var uploadAccept = Array.isArray(uploadConfig.accept) ? uploadConfig.accept.join(', ') : String(uploadConfig.accept || 'image/png, image/jpeg, image/gif, image/webp');
|
||||
var uploadHelpText = String(uploadConfig.helpText || 'PNG, JPG, GIF, or WebP');
|
||||
var uploadAccept = Array.isArray(uploadConfig.accept) ? uploadConfig.accept.join(', ') : String(uploadConfig.accept || 'image/png, image/jpeg, image/gif, image/webp, image/svg+xml');
|
||||
var uploadHelpText = String(uploadConfig.helpText || 'PNG, JPG, GIF, WebP, or SVG');
|
||||
return registry.renderEditorCardShell({
|
||||
region: region,
|
||||
headerActions: '<span class="chip">Image</span>',
|
||||
@@ -81,10 +81,10 @@
|
||||
current: String(context.current || ''),
|
||||
regionRatio: String(context.regionRatio || '1:1'),
|
||||
uploadConfig: {
|
||||
accept: Array.isArray(defaultConfig.accept) ? defaultConfig.accept : ['image/png', 'image/jpeg', 'image/gif', 'image/webp'],
|
||||
accept: Array.isArray(defaultConfig.accept) ? defaultConfig.accept : ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/svg+xml'],
|
||||
limitBytes: defaultConfig.limitBytes,
|
||||
limitLabel: defaultConfig.limitLabel || context.uploadMaxLabel || '100 MB',
|
||||
helpText: defaultConfig.helpText || 'PNG, JPG, GIF, or WebP'
|
||||
helpText: defaultConfig.helpText || 'PNG, JPG, GIF, WebP, or SVG'
|
||||
},
|
||||
uploadMaxLabel: context.uploadMaxLabel || '100 MB'
|
||||
};
|
||||
@@ -107,11 +107,11 @@
|
||||
}
|
||||
|
||||
var uploadConfig = context.uploadConfig || {};
|
||||
var accept = uploadConfig.accept || ['image/png', 'image/jpeg', 'image/gif', 'image/webp'];
|
||||
var accept = uploadConfig.accept || ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/svg+xml'];
|
||||
var limitBytes = Number(uploadConfig.limitBytes || 100 * 1024 * 1024);
|
||||
|
||||
if (!utils.fileMatchesAccept || !utils.fileMatchesAccept(context.file, accept)) {
|
||||
showUploadWarning('This image region accepts PNG, JPG, GIF, or WebP files.');
|
||||
showUploadWarning('This image region accepts PNG, JPG, GIF, WebP, or SVG files.');
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -132,10 +132,10 @@
|
||||
var defaultConfig = context && context.defaultConfig ? context.defaultConfig : {};
|
||||
|
||||
return {
|
||||
accept: ['image/png', 'image/jpeg', 'image/gif', 'image/webp'],
|
||||
accept: ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/svg+xml'],
|
||||
limitBytes: defaultConfig.limitBytes,
|
||||
limitLabel: defaultConfig.limitLabel,
|
||||
helpText: 'PNG, JPG, GIF, or WebP'
|
||||
helpText: 'PNG, JPG, GIF, WebP, or SVG'
|
||||
};
|
||||
},
|
||||
renderPreview: renderPreview,
|
||||
|
||||
@@ -222,6 +222,12 @@
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'<div class="card-body p-3 d-grid gap-3 pb-0">' +
|
||||
'<div class="d-flex justify-content-end">' +
|
||||
'<div class="btn-group btn-group-sm template-editor-size-controls" role="group" aria-label="Editor size controls">' +
|
||||
'<button type="button" class="btn btn-outline-secondary" data-editor-size-action="decrease" aria-label="Decrease editor size">-</button>' +
|
||||
'<button type="button" class="btn btn-outline-secondary" data-editor-size-action="increase" aria-label="Increase editor size">+</button>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'<div class="editor-holder" data-region-id="' + region.id + '">' +
|
||||
'<textarea class="editor-source" rows="10">' + escapeHtml(current.value !== undefined ? current.value : '') + '</textarea>' +
|
||||
'</div>' +
|
||||
|
||||
@@ -54,7 +54,13 @@
|
||||
'<span class="chip">Text</span>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'<div class="card-body p-3 d-grid">' +
|
||||
'<div class="card-body p-3 d-grid gap-2">' +
|
||||
'<div class="d-flex justify-content-end">' +
|
||||
'<div class="btn-group btn-group-sm template-editor-size-controls" role="group" aria-label="Editor size controls">' +
|
||||
'<button type="button" class="btn btn-outline-secondary" data-editor-size-action="decrease" aria-label="Decrease editor size">-</button>' +
|
||||
'<button type="button" class="btn btn-outline-secondary" data-editor-size-action="increase" aria-label="Increase editor size">+</button>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'<div class="editor-holder" data-region-id="' + region.id + '">' +
|
||||
'<textarea class="editor-source" rows="10">' + escapeHtml(current) + '</textarea>' +
|
||||
'</div>' +
|
||||
|
||||
@@ -302,6 +302,12 @@
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'<div class="card-body p-3 d-grid gap-3">' +
|
||||
'<div class="d-flex justify-content-end">' +
|
||||
'<div class="btn-group btn-group-sm template-editor-size-controls" role="group" aria-label="Editor size controls">' +
|
||||
'<button type="button" class="btn btn-outline-secondary" data-editor-size-action="decrease" aria-label="Decrease editor size">-</button>' +
|
||||
'<button type="button" class="btn btn-outline-secondary" data-editor-size-action="increase" aria-label="Increase editor size">+</button>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'<div class="editor-holder" data-region-id="' + region.id + '">' +
|
||||
'<textarea id="region_time_date_text_' + region.id + '" class="editor-source form-control" rows="4" name="region_text_' + region.id + '">' + escapeHtml(value) + '</textarea>' +
|
||||
'</div>' +
|
||||
|
||||
@@ -265,6 +265,12 @@
|
||||
'<div class="template-field-actions"><span class="chip">Timetable</span></div>' +
|
||||
'</div>' +
|
||||
'<div class="card-body p-3 d-grid gap-3">' +
|
||||
'<div class="d-flex justify-content-end">' +
|
||||
'<div class="btn-group btn-group-sm template-editor-size-controls" role="group" aria-label="Editor size controls">' +
|
||||
'<button type="button" class="btn btn-outline-secondary" data-editor-size-action="decrease" aria-label="Decrease editor size">-</button>' +
|
||||
'<button type="button" class="btn btn-outline-secondary" data-editor-size-action="increase" aria-label="Increase editor size">+</button>' +
|
||||
'</div>' +
|
||||
'</div>' +
|
||||
'<div class="editor-holder" data-region-id="' + region.id + '">' +
|
||||
'<textarea class="editor-source" rows="10">' + escapeHtml(currentValue) + '</textarea>' +
|
||||
'<input type="hidden" name="region_text_' + region.id + '" value="' + escapeHtml(currentValue) + '" />' +
|
||||
|
||||
@@ -8,6 +8,8 @@ export function createSlideFormEditorController(options) {
|
||||
var fontStylesheetHref = String(settings.fontStylesheetHref || '').trim();
|
||||
var defaultEditorFontFamily = 'Arial, Helvetica, sans-serif';
|
||||
var editorInstances = new Map();
|
||||
var editorHeights = new Map();
|
||||
var editorSizeControlsBound = false;
|
||||
var getRegionTypeModule = typeof settings.getRegionTypeModule === 'function' ? settings.getRegionTypeModule : function () {
|
||||
return null;
|
||||
};
|
||||
@@ -15,9 +17,13 @@ export function createSlideFormEditorController(options) {
|
||||
var imageUploadMaxBytes = Math.max(1, Number(settings.imageUploadMaxBytes || 2 * 1024 * 1024));
|
||||
var imageUploadLimitLabel = String(settings.imageUploadLimitLabel || '').trim() || Math.max(1, Math.round(imageUploadMaxBytes / (1024 * 1024))) + ' MB';
|
||||
var imageUploadContext = String(settings.imageUploadContext || 'wysiwyg').trim() || 'wysiwyg';
|
||||
var imageUploadAllowedExtensions = ['png', 'jpg', 'jpeg', 'gif', 'webp', 'bmp', 'avif', 'tif', 'tiff'];
|
||||
var imageUploadAllowedMimeTypes = ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/bmp', 'image/avif', 'image/tiff'];
|
||||
var imageUploadAllowedExtensions = ['png', 'jpg', 'jpeg', 'gif', 'webp', 'svg'];
|
||||
var imageUploadAllowedMimeTypes = ['image/png', 'image/jpeg', 'image/gif', 'image/webp', 'image/svg+xml'];
|
||||
var imageUploadFileTypes = imageUploadAllowedExtensions.join(',');
|
||||
var wysiwygEditorHeightStep = Math.max(1, Number(settings.wysiwygEditorHeightStep || 80));
|
||||
var wysiwygEditorHeightMin = Math.max(1, Number(settings.wysiwygEditorHeightMin || 240));
|
||||
var wysiwygEditorHeightMax = Math.max(wysiwygEditorHeightMin, Number(settings.wysiwygEditorHeightMax || 960));
|
||||
var wysiwygEditorHeightDefault = Math.max(wysiwygEditorHeightMin, Number(settings.wysiwygEditorHeightDefault || 360));
|
||||
var editorImageUploadPaths = new Set();
|
||||
var committedEditorImageUploadPaths = new Set();
|
||||
var pendingEditorImageUploadCleanupPaths = new Set();
|
||||
@@ -64,6 +70,99 @@ export function createSlideFormEditorController(options) {
|
||||
return '';
|
||||
}
|
||||
|
||||
function normalizeEditorHeightValue(value) {
|
||||
var numericValue = Number(value);
|
||||
if (!Number.isFinite(numericValue) || numericValue <= 0) {
|
||||
numericValue = wysiwygEditorHeightDefault;
|
||||
}
|
||||
|
||||
return Math.min(wysiwygEditorHeightMax, Math.max(wysiwygEditorHeightMin, Math.round(numericValue)));
|
||||
}
|
||||
|
||||
function getEditorHolder(regionId) {
|
||||
if (!templateFields) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return templateFields.querySelector('.editor-holder[data-region-id="' + regionId + '"]');
|
||||
}
|
||||
|
||||
function getEditorHeight(regionId) {
|
||||
var key = String(regionId || '');
|
||||
var storedHeight = editorHeights.get(key);
|
||||
if (storedHeight !== undefined && storedHeight !== null) {
|
||||
return normalizeEditorHeightValue(storedHeight);
|
||||
}
|
||||
|
||||
var holder = getEditorHolder(key);
|
||||
var holderHeight = holder && holder.dataset ? holder.dataset.editorHeight : '';
|
||||
var normalizedHeight = normalizeEditorHeightValue(holderHeight || wysiwygEditorHeightDefault);
|
||||
editorHeights.set(key, normalizedHeight);
|
||||
return normalizedHeight;
|
||||
}
|
||||
|
||||
function applyEditorHeight(regionId, height, options) {
|
||||
var key = String(regionId || '');
|
||||
var normalizedHeight = normalizeEditorHeightValue(height);
|
||||
var holder = getEditorHolder(key);
|
||||
var editor = editorInstances.get(key);
|
||||
var container = editor && typeof editor.getContainer === 'function' ? editor.getContainer() : null;
|
||||
var shouldRequestPreview = !(options && options.silent);
|
||||
|
||||
editorHeights.set(key, normalizedHeight);
|
||||
|
||||
if (holder) {
|
||||
holder.dataset.editorHeight = String(normalizedHeight);
|
||||
holder.style.height = normalizedHeight + 'px';
|
||||
holder.style.minHeight = normalizedHeight + 'px';
|
||||
}
|
||||
|
||||
if (container) {
|
||||
container.style.height = normalizedHeight + 'px';
|
||||
container.style.minHeight = normalizedHeight + 'px';
|
||||
}
|
||||
|
||||
if (editor && typeof editor.dispatch === 'function') {
|
||||
editor.dispatch('ResizeEditor');
|
||||
}
|
||||
|
||||
if (shouldRequestPreview) {
|
||||
requestPreviewRender();
|
||||
}
|
||||
}
|
||||
|
||||
function adjustEditorHeight(regionId, delta) {
|
||||
applyEditorHeight(regionId, getEditorHeight(regionId) + Number(delta || 0));
|
||||
}
|
||||
|
||||
function bindEditorSizeControls() {
|
||||
if (editorSizeControlsBound || !templateFields) {
|
||||
return;
|
||||
}
|
||||
|
||||
editorSizeControlsBound = true;
|
||||
templateFields.addEventListener('click', function (event) {
|
||||
var button = event.target && typeof event.target.closest === 'function' ? event.target.closest('[data-editor-size-action]') : null;
|
||||
if (!button) {
|
||||
return;
|
||||
}
|
||||
|
||||
var action = String(button.getAttribute('data-editor-size-action') || '').trim();
|
||||
if (action !== 'increase' && action !== 'decrease') {
|
||||
return;
|
||||
}
|
||||
|
||||
var card = typeof button.closest === 'function' ? button.closest('[data-region-id]') : null;
|
||||
var regionId = card ? card.getAttribute('data-region-id') : '';
|
||||
if (!regionId) {
|
||||
return;
|
||||
}
|
||||
|
||||
event.preventDefault();
|
||||
adjustEditorHeight(regionId, action === 'increase' ? wysiwygEditorHeightStep : -wysiwygEditorHeightStep);
|
||||
});
|
||||
}
|
||||
|
||||
function getEditorHiddenInput(regionId) {
|
||||
if (!templateFields) {
|
||||
return null;
|
||||
@@ -314,15 +413,15 @@ export function createSlideFormEditorController(options) {
|
||||
}
|
||||
|
||||
if (mimeType && imageUploadAllowedMimeTypes.indexOf(mimeType) === -1) {
|
||||
return 'This editor accepts PNG, JPG, GIF, WebP, BMP, AVIF, or TIFF images.';
|
||||
return 'This editor accepts PNG, JPG, GIF, WebP, or SVG images.';
|
||||
}
|
||||
|
||||
if (!mimeType && extension && imageUploadAllowedExtensions.indexOf(extension) === -1) {
|
||||
return 'This editor accepts PNG, JPG, GIF, WebP, BMP, AVIF, or TIFF images.';
|
||||
return 'This editor accepts PNG, JPG, GIF, WebP, or SVG images.';
|
||||
}
|
||||
|
||||
if (!mimeType && !extension) {
|
||||
return 'This editor accepts PNG, JPG, GIF, WebP, BMP, AVIF, or TIFF images.';
|
||||
return 'This editor accepts PNG, JPG, GIF, WebP, or SVG images.';
|
||||
}
|
||||
|
||||
return '';
|
||||
@@ -470,6 +569,8 @@ export function createSlideFormEditorController(options) {
|
||||
source.id = 'slide-editor-region-' + regionId;
|
||||
}
|
||||
|
||||
applyEditorHeight(regionId, getEditorHeight(regionId), { silent: true });
|
||||
|
||||
function registerInlineFormat(editor, formatName, styles) {
|
||||
editor.formatter.register(formatName, {
|
||||
inline: 'span',
|
||||
@@ -515,6 +616,8 @@ export function createSlideFormEditorController(options) {
|
||||
toolbar: 'undo redo | fontfamily fontsizeinput | forecolor backcolor bold italic underlineformats removeformat | align lineheight indent outdent bullist numlist table image chip | fullscreen',
|
||||
toolbar_mode: 'sliding',
|
||||
license_key: 'gpl',
|
||||
height: getEditorHeight(regionId),
|
||||
min_height: wysiwygEditorHeightMin,
|
||||
table_default_attributes: {
|
||||
border: '1',
|
||||
cellpadding: '0',
|
||||
@@ -601,6 +704,7 @@ export function createSlideFormEditorController(options) {
|
||||
}
|
||||
|
||||
editorInstances.set(regionId, editor);
|
||||
applyEditorHeight(regionId, getEditorHeight(regionId), { silent: true });
|
||||
if (editor.targetElm) {
|
||||
editor.targetElm.value = editor.getContent({ format: 'html' });
|
||||
}
|
||||
@@ -617,6 +721,7 @@ export function createSlideFormEditorController(options) {
|
||||
return Promise.resolve([]);
|
||||
}
|
||||
|
||||
bindEditorSizeControls();
|
||||
watchThemeChanges();
|
||||
|
||||
var holders = Array.prototype.slice.call(templateFields.querySelectorAll('.editor-holder'));
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
var currentInput = null;
|
||||
var currentFile = null;
|
||||
var currentObjectUrl = '';
|
||||
var cropperFrame = modal.querySelector('.slide-image-cropper-frame');
|
||||
var flipX = 1;
|
||||
var flipY = 1;
|
||||
var currentAspectRatio = NaN;
|
||||
@@ -40,6 +41,12 @@
|
||||
status.textContent = String(message || '');
|
||||
}
|
||||
|
||||
function setCropperLoading(loading) {
|
||||
if (cropperFrame) {
|
||||
cropperFrame.classList.toggle('is-loading', Boolean(loading));
|
||||
}
|
||||
}
|
||||
|
||||
function showModal() {
|
||||
if (window.pulseModal && typeof window.pulseModal.show === 'function') {
|
||||
window.pulseModal.show(modal);
|
||||
@@ -79,6 +86,7 @@
|
||||
function resetModalState() {
|
||||
destroyCropper();
|
||||
revokeObjectUrl();
|
||||
setCropperLoading(false);
|
||||
currentInput = null;
|
||||
currentFile = null;
|
||||
flipX = 1;
|
||||
@@ -118,6 +126,75 @@
|
||||
return width / height;
|
||||
}
|
||||
|
||||
function isSvgFile(file) {
|
||||
if (!file) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return String(file.type || '').toLowerCase() === 'image/svg+xml' || /\.svg$/i.test(String(file.name || ''));
|
||||
}
|
||||
|
||||
function isGifFile(file) {
|
||||
if (!file) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return String(file.type || '').toLowerCase() === 'image/gif' || /\.gif$/i.test(String(file.name || ''));
|
||||
}
|
||||
|
||||
function isSpecialRasterizationFile(file) {
|
||||
return isSvgFile(file) || isGifFile(file);
|
||||
}
|
||||
|
||||
function getSpecialFileWarning(file) {
|
||||
if (isGifFile(file)) {
|
||||
return 'GIF selected. If you crop, rotate, or flip this image, it will be rasterized and the animation will be lost. Leave the full image selected to keep the original GIF.';
|
||||
}
|
||||
|
||||
return 'SVG selected. If you crop, rotate, or flip this image, it will be rasterized. Leave the full image selected to keep the original SVG.';
|
||||
}
|
||||
|
||||
function isOriginalSpecialSelection() {
|
||||
if (!cropper || !currentFile || !isSpecialRasterizationFile(currentFile) || typeof cropper.getData !== 'function' || typeof cropper.getImageData !== 'function') {
|
||||
return false;
|
||||
}
|
||||
|
||||
var cropData = cropper.getData(true) || {};
|
||||
var imageData = cropper.getImageData() || {};
|
||||
var width = Number(imageData.naturalWidth || 0);
|
||||
var height = Number(imageData.naturalHeight || 0);
|
||||
|
||||
if (!Number.isFinite(width) || !Number.isFinite(height) || width <= 0 || height <= 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return Math.abs(Number(cropData.x || 0)) < 0.5 &&
|
||||
Math.abs(Number(cropData.y || 0)) < 0.5 &&
|
||||
Math.abs(Number(cropData.width || 0) - width) < 0.5 &&
|
||||
Math.abs(Number(cropData.height || 0) - height) < 0.5 &&
|
||||
Math.abs(Number(cropData.rotate || 0)) < 0.5 &&
|
||||
Number(cropData.scaleX || 1) === 1 &&
|
||||
Number(cropData.scaleY || 1) === 1;
|
||||
}
|
||||
|
||||
function getRasterizedFileName(sourceName) {
|
||||
var name = String(sourceName || '').trim();
|
||||
|
||||
if (!name) {
|
||||
return 'slide-region-image.png';
|
||||
}
|
||||
|
||||
if (/\.svg$/i.test(name)) {
|
||||
return name.replace(/\.svg$/i, '.png');
|
||||
}
|
||||
|
||||
if (/\.[a-z0-9]+$/i.test(name)) {
|
||||
return name.replace(/\.[a-z0-9]+$/i, '.png');
|
||||
}
|
||||
|
||||
return name + '.png';
|
||||
}
|
||||
|
||||
function setActiveRatioButton(value) {
|
||||
var targetValue = ratioLabelForValue(value);
|
||||
modal.querySelectorAll('[data-slide-image-cropper-action="ratio"]').forEach(function (button) {
|
||||
@@ -183,6 +260,8 @@
|
||||
zoomOnTouch: true,
|
||||
zoomOnWheel: true,
|
||||
ready: function () {
|
||||
setCropperLoading(false);
|
||||
|
||||
if (cropper && cropper.container) {
|
||||
cropper.container.style.width = '100%';
|
||||
cropper.container.style.height = '560px';
|
||||
@@ -209,7 +288,10 @@
|
||||
|
||||
setButtonState(false);
|
||||
setActiveRatioButton(currentAspectRatio === undefined ? 'free' : currentAspectRatio);
|
||||
setStatus('Use the toolbar to crop, rotate, or flip the image before applying it.');
|
||||
|
||||
if (isSpecialRasterizationFile(currentFile)) {
|
||||
setStatus(getSpecialFileWarning(currentFile));
|
||||
}
|
||||
}
|
||||
|
||||
function openEditor(input, file) {
|
||||
@@ -220,8 +302,9 @@
|
||||
currentAspectRatio = 'free';
|
||||
currentRegionAspectRatio = parseAspectRatio(input && input.dataset && input.dataset.slideImageCropperRegionRatio);
|
||||
currentRegionAspectRatioLabel = String(input && input.dataset && input.dataset.slideImageCropperRegionRatioLabel || 'Region').trim() || 'Region';
|
||||
setCropperLoading(true);
|
||||
setButtonState(true);
|
||||
setStatus('Loading image editor...');
|
||||
setStatus(isSpecialRasterizationFile(file) ? getSpecialFileWarning(file) : '');
|
||||
|
||||
modal.querySelectorAll('[data-slide-image-cropper-action="ratio"][data-slide-image-cropper-ratio="region"]').forEach(function (button) {
|
||||
button.title = currentRegionAspectRatioLabel ? 'Region ratio ' + currentRegionAspectRatioLabel : 'Region ratio';
|
||||
@@ -286,11 +369,62 @@
|
||||
hideModal();
|
||||
}
|
||||
|
||||
function finalizeCurrentSvgSelection() {
|
||||
if (!currentFile) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (isOriginalSpecialSelection()) {
|
||||
finalizeCropFile(currentFile);
|
||||
return;
|
||||
}
|
||||
|
||||
setButtonState(true);
|
||||
setStatus('Creating a rasterized image from the crop...');
|
||||
|
||||
var canvas = cropper && typeof cropper.getCroppedCanvas === 'function' ? cropper.getCroppedCanvas({
|
||||
fillColor: 'transparent',
|
||||
imageSmoothingEnabled: true,
|
||||
imageSmoothingQuality: 'high'
|
||||
}) : null;
|
||||
|
||||
if (!canvas) {
|
||||
setStatus('Unable to create the cropped image.');
|
||||
setButtonState(false);
|
||||
return;
|
||||
}
|
||||
|
||||
canvas.toBlob(function (blob) {
|
||||
if (!blob) {
|
||||
setStatus('Unable to create the cropped image.');
|
||||
setButtonState(false);
|
||||
return;
|
||||
}
|
||||
|
||||
var finalFile = new File([blob], getRasterizedFileName(currentFile.name), {
|
||||
lastModified: Date.now(),
|
||||
type: blob.type || 'image/png'
|
||||
});
|
||||
|
||||
finalizeCropFile(finalFile);
|
||||
}, 'image/png');
|
||||
}
|
||||
|
||||
function commitCrop() {
|
||||
if (!currentInput || !currentFile) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (isSpecialRasterizationFile(currentFile)) {
|
||||
if (!cropper) {
|
||||
finalizeCropFile(currentFile);
|
||||
return;
|
||||
}
|
||||
|
||||
finalizeCurrentSvgSelection();
|
||||
return;
|
||||
}
|
||||
|
||||
if (!cropper) {
|
||||
finalizeCropFile(currentFile);
|
||||
return;
|
||||
@@ -381,7 +515,7 @@
|
||||
return;
|
||||
}
|
||||
|
||||
if (!/^image\//i.test(file.type || '')) {
|
||||
if (!/^image\//i.test(file.type || '') && !/\.svg$/i.test(String(file.name || ''))) {
|
||||
input.value = '';
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user