Skip to content

fixes issue by norbert #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skerbis merged 1 commit into from
May 30, 2026
Merged

fixes issue by norbert #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 48 additions & 41 deletions assets/cropper_ui_fix.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,25 @@ form.cropper-is-saving .cropper-save-overlay {
z-index: 1200;
}

.cropper-page-options {
align-items: center;
display: inline-flex;
gap: 10px;
}

.cropper-page-toggles {
align-items: center;
display: inline-flex;
gap: 8px;
}

.cropper-page-toggles .btn {
border-radius: 8px;
min-height: 32px;
min-width: 32px;
padding: 0;
}

body.rex-theme-dark #cropper-workspace {
--cropper-bg: #18212b;
--cropper-panel: #202b36;
Expand Down Expand Up @@ -186,43 +205,12 @@ form.cropper-is-saving .cropper-save-overlay {
overflow: hidden;
}

#cropper-workspace .cropper-stage-header,
#cropper-workspace .docs-buttons,
#cropper-workspace .docs-toggles,
#cropper-workspace .cropper-sidebar-panel {
padding: 18px 20px;
}

#cropper-workspace .cropper-stage-header {
align-items: flex-start;
display: flex;
gap: 16px;
justify-content: space-between;
}

#cropper-workspace .cropper-stage-actions {
align-items: center;
display: inline-flex;
gap: 8px;
}

#cropper-workspace .cropper-sidebar-toggle {
min-height: 40px;
min-width: 40px;
}

#cropper-workspace .cropper-toolbar-toggle {
display: none;
min-height: 40px;
min-width: 40px;
}

#cropper-workspace.is-compact-toolbar .cropper-toolbar-toggle {
align-items: center;
display: inline-flex;
justify-content: center;
}

#cropper-workspace.is-sidebar-collapsed .cropper-hero {
grid-template-columns: minmax(0, 1fr);
}
Expand All @@ -231,7 +219,6 @@ form.cropper-is-saving .cropper-save-overlay {
display: none;
}

#cropper-workspace .cropper-stage-kicker,
#cropper-workspace .cropper-toolbar-label {
color: var(--cropper-text-soft);
display: block;
Expand All @@ -242,15 +229,8 @@ form.cropper-is-saving .cropper-save-overlay {
text-transform: uppercase;
}

#cropper-workspace .cropper-stage-title {
font-size: 18px;
font-weight: 600;
line-height: 1.3;
margin: 0;
}

#cropper-workspace .cropper_image_wrapper {
padding: 0 20px 20px;
padding: 20px;
}

#cropper-workspace .cropper-stage {
Expand All @@ -267,7 +247,6 @@ form.cropper-is-saving .cropper-save-overlay {

#cropper-workspace cropper-canvas {
background-color: transparent;
border-radius: 12px;
height: var(--cropper-stage-height);
min-height: var(--cropper-stage-height);
width: 100%;
Expand Down Expand Up @@ -404,6 +383,34 @@ form.cropper-is-saving .cropper-save-overlay {

#cropper-workspace .cropper-settings {
margin-left: auto;
position: relative;
}

#cropper-workspace .cropper-settings .dropdown-menu {
border-radius: 10px;
margin-top: 8px;
min-width: 180px;
padding: 8px;
z-index: 1200;
}

#cropper-workspace .cropper-settings .dropdown-menu > li {
list-style: none;
}

#cropper-workspace .cropper-settings .dropdown-menu > li > label {
align-items: center;
cursor: pointer;
display: inline-flex;
gap: 8px;
margin: 0;
padding: 4px 2px;
width: 100%;
}

#cropper-workspace .cropper-settings .dropdown-menu .form-check-input {
margin: 0;
position: static;
}

#cropper-workspace .cropper-sidebar {
Expand Down
87 changes: 69 additions & 18 deletions assets/js/rex_cropper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ class BackendCropper {
this.selectionOverlay = this.root.querySelector('#cropper-selection-overlay');
this.selectionGrabHandle = this.root.querySelector('#cropper-selection-grab');
this.sidebar = this.root.querySelector('#cropper-sidebar');
this.sidebarToggle = this.root.querySelector('#cropper_sidebar_toggle');
this.toolbarToggle = this.root.querySelector('#cropper_toolbar_toggle');
this.sidebarToggle = this.root.querySelector('#cropper_sidebar_toggle') || document.querySelector('#cropper_sidebar_toggle');
this.toolbarToggle = this.root.querySelector('#cropper_toolbar_toggle') || document.querySelector('#cropper_toolbar_toggle');
this.toolbarClose = this.root.querySelector('#cropper_toolbar_close');
this.toolbarButtons = this.root.querySelector('#cropper-toolbar-buttons');
this.toolbarToggles = this.root.querySelector('#cropper-toolbar-toggles');
Expand Down Expand Up @@ -221,7 +221,7 @@ class BackendCropper {
}

this.handleCanvasAction = this.syncHiddenFields.bind(this);
this.handleWheel = this.preventWheelZoom.bind(this);
this.handleStageWheel = this.forwardWheelToPageWhenZoomDisabled.bind(this);
this.handleWindowResize = this.updateStageHeight.bind(this);
this.handleSelectionGripMove = this.moveSelectionWithGrip.bind(this);
this.handleSelectionGripEnd = this.stopSelectionGripDrag.bind(this);
Expand All @@ -245,7 +245,8 @@ class BackendCropper {
window.addEventListener('resize', this.handleWindowResize);
this.cropperCanvas.addEventListener('action', this.handleCanvasAction);
this.cropperCanvas.addEventListener('actionend', this.handleCanvasAction);
this.cropperCanvas.addEventListener('wheel', this.handleWheel, { capture: true });
this.cropperCanvas.addEventListener('wheel', this.handleStageWheel, { capture: true, passive: false });
this.stage?.addEventListener('wheel', this.handleStageWheel, { capture: true, passive: false });

this.root.querySelector('.docs-buttons')?.addEventListener('click', (event) => {
const button = event.target.closest('[data-method]');
Expand Down Expand Up @@ -281,10 +282,17 @@ class BackendCropper {
}

if (input.type === 'checkbox' && input.name === 'zoomOnWheel') {
this.state.wheelZoomEnabled = input.checked;
this.applyWheelZoomState(input.checked);
}
});

const wheelZoomCheckbox = this.root.querySelector('input[name="zoomOnWheel"]');
if (wheelZoomCheckbox instanceof HTMLInputElement) {
this.applyWheelZoomState(wheelZoomCheckbox.checked);
} else {
this.applyWheelZoomState(false);
}

this.root.querySelector('.cropper-ratio-group')?.addEventListener('click', (event) => {
const label = event.target.closest('label.btn');

Expand Down Expand Up @@ -407,12 +415,14 @@ class BackendCropper {
return;
}

let collapsed = false;
const initialOpen = this.root.dataset.sidebarInitialOpen === '1';
let collapsed = !initialOpen;

try {
collapsed = window.localStorage.getItem(this.sidebarStorageKey) === '1';
const storedValue = window.localStorage.getItem(this.sidebarStorageKey);
collapsed = storedValue === null ? !initialOpen : storedValue === '1';
} catch (error) {
collapsed = false;
collapsed = !initialOpen;
}

this.setSidebarCollapsed(collapsed, false);
Expand Down Expand Up @@ -633,14 +643,64 @@ class BackendCropper {
this.cropperSelection.movable = true;
this.cropperSelection.resizable = true;
this.cropperSelection.keyboard = true;
this.cropperSelection.zoomable = true;
this.cropperSelection.zoomable = this.state.wheelZoomEnabled;
this.cropperSelection.aspectRatio = this.getSelectedAspectRatio();
this.cropperSelection.initialAspectRatio = this.getSelectedAspectRatio();
this.cropperSelection.hidden = false;
this.cropperSelection.$reset();
this.setDragMode('crop');
}

applyWheelZoomState(enabled) {
const normalized = enabled === true;
this.state.wheelZoomEnabled = normalized;

if (this.cropperSelection) {
this.cropperSelection.zoomable = normalized;
}

if (this.cropperCanvas && 'scaleStep' in this.cropperCanvas) {
this.cropperCanvas.scaleStep = normalized ? 0.1 : 0;
}
}

forwardWheelToPageWhenZoomDisabled(event) {
if (this.state.wheelZoomEnabled) {
return;
}

const target = event.target;
const inStage = target instanceof Node
&& (
(this.cropperCanvas instanceof HTMLElement && this.cropperCanvas.contains(target))
|| (this.stage instanceof HTMLElement && this.stage.contains(target))
);

if (!inStage) {
return;
}

event.preventDefault();
event.stopImmediatePropagation();

let deltaX = event.deltaX;
let deltaY = event.deltaY;

if (event.deltaMode === 1) {
deltaX *= 16;
deltaY *= 16;
} else if (event.deltaMode === 2) {
deltaX *= window.innerWidth;
deltaY *= window.innerHeight;
}

window.scrollBy({
left: deltaX,
top: deltaY,
behavior: 'auto',
});
}

ensureSelection() {
if (!this.cropperSelection) {
return false;
Expand Down Expand Up @@ -892,15 +952,6 @@ class BackendCropper {
this.selectionOverlay.style.height = `${this.cropperSelection.height}px`;
}

preventWheelZoom(event) {
if (this.state.wheelZoomEnabled) {
return;
}

event.preventDefault();
event.stopImmediatePropagation();
}

applyAspectRatio(ratio) {
if (!this.ensureSelection()) {
return;
Expand Down
55 changes: 16 additions & 39 deletions fragments/cropper_panel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,56 +39,33 @@
} elseif (is_array($compactToolbarConfig)) {
$compactToolbarInStage = in_array(1, $compactToolbarConfig, true) || in_array('1', $compactToolbarConfig, true);
}

$showSidebarInitiallyConfig = rex_config::get('cropper', 'show_info_sidebar_initially', 0);
$showSidebarInitially = false;
if (is_bool($showSidebarInitiallyConfig)) {
$showSidebarInitially = $showSidebarInitiallyConfig;
} elseif (is_int($showSidebarInitiallyConfig) || is_float($showSidebarInitiallyConfig)) {
$showSidebarInitially = (int) $showSidebarInitiallyConfig === 1;
} elseif (is_string($showSidebarInitiallyConfig)) {
$trimmedConfig = trim($showSidebarInitiallyConfig);
if ('' !== $trimmedConfig) {
$showSidebarInitially = preg_match('/(^|\|)1(\||$)/', $trimmedConfig) === 1;
}
} elseif (is_array($showSidebarInitiallyConfig)) {
$showSidebarInitially = in_array(1, $showSidebarInitiallyConfig, true) || in_array('1', $showSidebarInitiallyConfig, true);
}
?>

<div
id="cropper-workspace"
class="cropper-workspace<?= $compactToolbarInStage ? ' is-compact-toolbar' : '' ?>"
data-media-width="<?= (int) $media->getWidth() ?>"
data-media-height="<?= (int) $media->getHeight() ?>"
data-sidebar-initial-open="<?= $showSidebarInitially ? '1' : '0' ?>"
>
<div class="cropper-hero">
<section class="cropper-main-panel">
<div class="cropper-stage-card">
<div class="cropper-stage-header">
<div>
<span class="cropper-stage-kicker"><?= rex_i18n::msg('cropper_workspace_title') ?></span>
<p class="cropper-stage-title"><?= $this->escape($media->getFileName()) ?></p>
</div>
<div class="cropper-stage-actions">
<button
type="button"
id="cropper_sidebar_toggle"
class="btn btn-default cropper-sidebar-toggle"
aria-expanded="true"
aria-controls="cropper-sidebar"
data-expanded-label="<?= rex_i18n::msg('cropper_sidebar_collapse') ?>"
data-collapsed-label="<?= rex_i18n::msg('cropper_sidebar_expand') ?>"
data-toggle="tooltip"
data-animation="false"
data-original-title="<?= rex_i18n::msg('cropper_sidebar_collapse') ?>"
>
<span class="fa fa-columns" aria-hidden="true"></span>
</button>
<?php if ($compactToolbarInStage) : ?>
<button
type="button"
id="cropper_toolbar_toggle"
class="btn btn-default cropper-toolbar-toggle"
aria-expanded="true"
aria-controls="cropper-toolbar-buttons cropper-toolbar-toggles"
data-expanded-label="<?= rex_i18n::msg('cropper_toolbar_collapse') ?>"
data-collapsed-label="<?= rex_i18n::msg('cropper_toolbar_expand') ?>"
data-toggle="tooltip"
data-animation="false"
data-original-title="<?= rex_i18n::msg('cropper_toolbar_collapse') ?>"
>
<span class="fa fa-sliders" aria-hidden="true"></span>
</button>
<?php endif; ?>
</div>
</div>

<div class="cropper_image_wrapper">
<div class="cropper-stage">
<img id="cropper_image" src="<?= $mediaUrl;?>?buster=<?= $mtime;?>" alt="">
Expand Down
4 changes: 4 additions & 0 deletions install.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@
if (null === $addon->getConfig('compact_toolbar_in_stage')) {
$addon->setConfig('compact_toolbar_in_stage', 0);
}

if (null === $addon->getConfig('show_info_sidebar_initially')) {
$addon->setConfig('show_info_sidebar_initially', 0);
}
2 changes: 2 additions & 0 deletions lang/de_de.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ cropper_settings_show_edit_in_list = Zuschneiden-Link in der Medienliste einblen
cropper_settings_show = Zuschneiden-Link einblenden
cropper_settings_toolbar_mode = Toolbar-Modus
cropper_settings_toolbar_compact_hover = Kompakte Werkzeug-Seitenleiste neben der Bühne aktivieren
cropper_settings_sidebar_mode = Info-Sidebar
cropper_settings_sidebar_initial_open = Info-Sidebar beim Öffnen anzeigen
cropper_saving_message = Bild wird gespeichert...
cropper_workspace_title = Arbeitsbereich
cropper_workspace_hint = Mehr Platz, schnelleres Zuschneiden: Ausschnitt ziehen, mit den Presets skalieren und direkt in der Vorschau kontrollieren.
Expand Down
2 changes: 2 additions & 0 deletions lang/en_gb.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ cropper_settings_show_edit_in_list = Show cropping link in media list
cropper_settings_show = Show cropping link
cropper_settings_toolbar_mode = Toolbar mode
cropper_settings_toolbar_compact_hover = Enable compact tool sidebar next to stage
cropper_settings_sidebar_mode = Info sidebar
cropper_settings_sidebar_initial_open = Show info sidebar on open
cropper_saving_message = Saving image...
cropper_workspace_title = Workspace
cropper_workspace_hint = More room, faster cropping: draw a selection, resize it with presets and verify the result in the live preview.
Expand Down
Loading
Loading