Skip to content

EspoCRM – Open Source CRM Application

fit image on maximize

Yuri Kuznetsovbab9140ef249
diff --git a/client/src/ui.js b/client/src/ui.js
index 12fef1c1a3..6eb4230575 100644
--- a/client/src/ui.js
+++ b/client/src/ui.js
@@ -123,7 +123,6 @@ class Dialog {
*/
onMinimize
-
/**
* @param {module:ui.Dialog~Params} options Options.
*/
@@ -196,6 +195,14 @@ class Dialog {
}
});
+ if (options.onMaximize) {
+ this.onMaximize = options.onMaximize;
+ }
+
+ if (options.onMinimize) {
+ this.onMinimize = options.onMinimize;
+ }
+
/** @private */
this.onCloseIsCalled = false;
@@ -504,14 +511,14 @@ class Dialog {
this.maximizeButtonElement = a;
a.addEventListener('click', () => {
- if (this.onMaximize) {
- this.onMaximize();
- }
-
this.maximizeButtonElement.classList.add('hidden');
this.minimizeButtonElement.classList.remove('hidden');
this.el.querySelector('.modal-dialog').classList.add('maximized');
+
+ if (this.onMaximize) {
+ this.onMaximize();
+ }
});
}
@@ -531,14 +538,14 @@ class Dialog {
this.minimizeButtonElement = a;
a.addEventListener('click', () => {
- if (this.onMinimize) {
- this.onMinimize();
- }
-
this.minimizeButtonElement.classList.add('hidden');
this.maximizeButtonElement.classList.remove('hidden');
this.el.querySelector('.modal-dialog').classList.remove('maximized');
+
+ if (this.onMinimize) {
+ this.onMinimize();
+ }
});
}
}
diff --git a/client/src/views/modal.js b/client/src/views/modal.js
index a257d3f967..30724d4011 100644
--- a/client/src/views/modal.js
+++ b/client/src/views/modal.js
@@ -377,6 +377,8 @@ class ModalView extends View {
maximizeButton: this.isMaximizable && !this.getHelper().isXsScreen(),
onRemove: () => this.onDialogClose(),
onBackdropClick: () => this.onBackdropClick(),
+ onMaximize: () => this.onMaximize(),
+ onMinimize: () => this.onMinimize(),
});
this.containerElement = document.querySelector(this.containerSelector);
@@ -1227,6 +1229,18 @@ class ModalView extends View {
$footer.removeClass('shadowed');
});
}
+
+ /**
+ * @protected
+ * @since 9.1.0
+ */
+ onMaximize() {}
+
+ /**
+ * @protected
+ * @since 9.1.0
+ */
+ onMinimize() {}
}
export default ModalView;
diff --git a/client/src/views/modals/image-preview.js b/client/src/views/modals/image-preview.js
index 8ddcf260d3..6735b753d0 100644
--- a/client/src/views/modals/image-preview.js
+++ b/client/src/views/modals/image-preview.js
@@ -49,6 +49,18 @@ class ImagePreviewModalView extends ModalView {
'transform-rotate-270',
]
+ /**
+ * @protected
+ * @type {HTMLElement}
+ */
+ imageContainerElement
+
+ /**
+ * @protected
+ * @type {HTMLImageElement}
+ */
+ imageElement
+
events = {
/** @this ImagePreviewModalView */
'keydown': function (e) {
@@ -120,8 +132,13 @@ class ImagePreviewModalView extends ModalView {
afterRender() {
const $container = this.$el.find('.image-container');
+
+ this.imageContainerElement = $container.get(0);
+
const $img = this.$img = this.$el.find('.image-container img');
+ this.imageElement = $img.get(0);
+
$img.on('load', () => {
const imgEl = $img.get(0);
@@ -257,6 +274,23 @@ class ImagePreviewModalView extends ModalView {
this.reRender();
}
+
+
+ onMaximize() {
+ /** @type {HTMLDivElement} */
+ const body = this.element.querySelector('.modal-body');
+
+ const width = this.imageContainerElement.clientWidth
+ const height = body.clientHeight;
+
+ this.imageElement.style.maxWidth = width + 'px';
+ //this.imageElement.style.maxHeight = height + 'px';
+ }
+
+ onMinimize() {
+ this.imageElement.style.maxWidth = this.imageContainerElement.clientWidth + 'px';
+ //this.imageElement.style.maxHeight = '';
+ }
}
export default ImagePreviewModalView;
diff --git a/frontend/less/espo/elements/modal.less b/frontend/less/espo/elements/modal.less
index a6fb4404b0..a16eaf2e01 100644
--- a/frontend/less/espo/elements/modal.less
+++ b/frontend/less/espo/elements/modal.less
@@ -216,9 +216,22 @@
.modal-dialog {
margin: 0 0;
}
- .modal-dialog .image-container {
- margin-left: calc(0rem - var(--panel-padding));
- margin-right: calc(0rem - var(--panel-padding));
+
+ .modal-dialog {
+ .image-container {
+ margin-left: calc(0rem - var(--modal-padding));
+ margin-right: calc(0rem - var(--panel-padding));
+ }
+ }
+}
+
+.modal-dialog {
+ &.maximized {
+ .image-container {
+ > img {
+ max-height: calc(100vh - (var(--43px) + var(--modal-inner-padding) * 2));
+ }
+ }
}
}