EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
ref
Yuri Kuznetsov58e091b45e50
diff --git a/client/src/views/collapsed-modal-bar.js b/client/src/views/collapsed-modal-bar.jsindex 31a17c529d..120d237521 100644--- a/client/src/views/collapsed-modal-bar.js+++ b/client/src/views/collapsed-modal-bar.js@@ -28,7 +28,7 @@import View from 'view';-class CollapsedModalBar extends View {+class CollapsedModalBarView extends View {// language=HandlebarstemplateContent = `@@ -196,5 +196,4 @@ class CollapsedModalBar extends View {}}-// noinspection JSUnusedGlobalSymbols-export default CollapsedModalBar;+export default CollapsedModalBarView;diff --git a/client/src/views/modal.js b/client/src/views/modal.jsindex 65c55d9a2d..45bd0e81ad 100644--- a/client/src/views/modal.js+++ b/client/src/views/modal.js@@ -29,6 +29,7 @@/** @module views/modal */import View from 'view';+import CollapsedModalBarView from 'views/collapsed-modal-bar';/*** A base modal view. Can be extended or used directly.@@ -1107,53 +1108,53 @@ class ModalView extends View {/*** Collapse.*/- collapse() {- this.beforeCollapse().then(data => {- if (!this.getParentView()) {- throw new Error("Can't collapse w/o parent view.");- }+ async collapse() {+ let data = await this.beforeCollapse();- this.isCollapsed = true;+ if (!this.getParentView()) {+ throw new Error("Can't collapse w/o parent view.");+ }- data = data || {};+ this.isCollapsed = true;- let title;+ data = data || {};- if (data.title) {- title = data.title;- } else {- const $title = $(this.containerElement).find('.modal-header .modal-title .modal-title-text');+ let title;- title = $title.text();+ if (data.title) {+ title = data.title;+ } else {+ const titleElement = this.containerElement.querySelector('.modal-header .modal-title .modal-title-text');++ if (titleElement) {+ title = titleElement.textContent;}+ }- this.dialog.close();+ this.dialog.close();- let masterView = this;+ let masterView = this;- while (masterView.getParentView()) {- masterView = masterView.getParentView();- }+ while (masterView.getParentView()) {+ masterView = masterView.getParentView();+ }- this.unchainFromParent();+ this.unchainFromParent();- (new Promise(resolve => {- if (masterView.hasView('collapsedModalBar')) {- resolve(masterView.getView('collapsedModalBar'));+ /** @type {CollapsedModalBarView} */+ let barView;- return;- }+ const key = 'collapsedModalBar';- masterView- .createView('collapsedModalBar', 'views/collapsed-modal-bar', {- fullSelector: 'body > .collapsed-modal-bar',- })- .then(view => resolve(view));- }))- .then(barView => {- barView.addModalView(this, {title: title});- });- });+ if (masterView.hasView(key)) {+ barView = masterView.getView(key);+ } else {+ barView = new CollapsedModalBarView({fullSelector: 'body > .collapsed-modal-bar'});++ await masterView.assignView(key, barView);+ }++ barView.addModalView(this, {title: title});}unchainFromParent() {