espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

header fix

Browse Source
This commit is contained in:
Yuri Kuznetsov
2022-08-19 18:44:32 +03:00
parent b8a53f793a
commit 483b717825
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/views/header.js
+8
View File
@@ -76,12 +76,20 @@ define('views/header', ['view'], function (Dep) {
}
});
}
this.wasRendered = false;
},
afterRender: function () {
if (this.options.fontSizeFlexible) {
this.adjustFontSize();
}
if (this.wasRendered) {
this.getParentView().trigger('header-rendered');
}
this.wasRendered = true;
},
adjustFontSize: function (step) {
client/src/views/main.js
+8 -4
View File
@@ -170,6 +170,10 @@ define('views/main', ['view'], function (Dep) {
this.$headerActionsContainer = this.$el.find('.page-header .header-buttons');
});
this.on('header-rendered', () => {
this.$headerActionsContainer = this.$el.find('.page-header .header-buttons');
});
this.on('after:render', () => this.adjustButtons());
if (this.shortcutKeys) {
@@ -399,14 +403,14 @@ define('views/main', ['view'], function (Dep) {
this.menu[type][method](item);
if (!doNotReRender && this.isRendered()) {
this.getView('header').reRender();
this.getHeaderView().reRender();
return;
}
if (!doNotReRender && this.isBeingRendered()) {
this.once('after:render', () => {
this.getView('header').reRender();
this.getHeaderView().reRender();
});
}
},
@@ -437,14 +441,14 @@ define('views/main', ['view'], function (Dep) {
}
if (!doNotReRender && this.isRendered()) {
this.getView('header').reRender();
this.getHeaderView().reRender();
return;
}
if (!doNotReRender && this.isBeingRendered()) {
this.once('after:render', () => {
this.getView('header').reRender();
this.getHeaderView().reRender();
});
return;