Skip to content

EspoCRM – Open Source CRM Application

Update bullbone. Use buffer reRender.

Yurii08f63f68dbb3
diff --git a/client/src/views/main.ts b/client/src/views/main.ts
index b3c307ef1b..eb5d7069a1 100644
--- a/client/src/views/main.ts
+++ b/client/src/views/main.ts
@@ -310,11 +310,7 @@ class MainView<S extends MainViewSchema = MainViewSchema> extends View<S> {
}
this.listenTo(this.model as Model, 'sync', () => {
- if (!this.getHeaderView()) {
- return;
- }
-
- this.getHeaderView().reRender();
+ this.reRenderHeader();
});
});
}
@@ -347,6 +343,10 @@ class MainView<S extends MainViewSchema = MainViewSchema> extends View<S> {
});
}
+ private reRenderHeader() {
+ this.getHeaderView()?.reRender({buffer: true});
+ }
+
private initShortcuts() {
if (!this.shortcutKeys) {
return;
@@ -547,17 +547,7 @@ class MainView<S extends MainViewSchema = MainViewSchema> extends View<S> {
return;
}
- if (this.isRendered()) {
- this.getHeaderView().reRender();
-
- return;
- }
-
- if (this.isBeingRendered()) {
- this.whenRendered().then(() => {
- this.getHeaderView().reRender();
- })
- }
+ this.reRenderHeader();
}
/**
@@ -622,17 +612,11 @@ class MainView<S extends MainViewSchema = MainViewSchema> extends View<S> {
list.push(item);
}
- if (!doNotReRender && this.isRendered()) {
- this.getHeaderView().reRender();
-
+ if (doNotReRender) {
return;
}
- if (!doNotReRender && this.isBeingRendered()) {
- this.once('after:render', () => {
- this.getHeaderView().reRender();
- });
- }
+ this.reRenderHeader();
}
/**
@@ -662,17 +646,8 @@ class MainView<S extends MainViewSchema = MainViewSchema> extends View<S> {
items.splice(index, 1);
}
- if (!doNotReRender && this.isRendered()) {
- this.getHeaderView().reRender();
-
- return;
- }
-
- if (!doNotReRender && this.isBeingRendered()) {
- this.once('after:render', () => {
- this.getHeaderView().reRender();
-
- });
+ if (!doNotReRender) {
+ this.reRenderHeader();
return;
}
@@ -807,9 +782,7 @@ class MainView<S extends MainViewSchema = MainViewSchema> extends View<S> {
this.controlMenuDropdownVisibility();
this.adjustButtons();
- if (this.getHeaderView()) {
- this.getHeaderView().trigger('action-item-update');
- }
+ this.getHeaderView()?.trigger('action-item-update');
}
/**
@@ -830,9 +803,7 @@ class MainView<S extends MainViewSchema = MainViewSchema> extends View<S> {
// Item can be available but not rendered as it was skipped by access check in getMenu.
if (item && !$dropdownItem.length && !$button.length) {
- if (this.getHeaderView()) {
- this.getHeaderView().reRender();
- }
+ this.reRenderHeader();
return;
}
@@ -843,9 +814,7 @@ class MainView<S extends MainViewSchema = MainViewSchema> extends View<S> {
this.controlMenuDropdownVisibility();
this.adjustButtons();
- if (this.getHeaderView()) {
- this.getHeaderView().trigger('action-item-update');
- }
+ this.getHeaderView()?.trigger('action-item-update');
};
if (!this.isRendered()) {
diff --git a/client/src/views/record/detail.ts b/client/src/views/record/detail.ts
index 91184f1e48..a3a2d13c6b 100644
--- a/client/src/views/record/detail.ts
+++ b/client/src/views/record/detail.ts
@@ -1096,8 +1096,7 @@ class DetailRecordView<S extends DetailRecordViewSchema = DetailRecordViewSchema
}
if (this.isRendered()) {
- this.getButtonsView()?.reRender();
- this.getEditButtonsView()?.reRender();
+ this.reRenderButtons();
}
}
@@ -1140,8 +1139,7 @@ class DetailRecordView<S extends DetailRecordViewSchema = DetailRecordViewSchema
}
if (this.isRendered()) {
- this.getButtonsView()?.reRender();
- this.getEditButtonsView()?.reRender();
+ this.reRenderButtons();
}
}
@@ -1185,8 +1183,7 @@ class DetailRecordView<S extends DetailRecordViewSchema = DetailRecordViewSchema
}
if (this.isRendered()) {
- this.getButtonsView()?.reRender();
- this.getEditButtonsView()?.reRender();
+ this.reRenderButtons();
}
}
@@ -1230,8 +1227,7 @@ class DetailRecordView<S extends DetailRecordViewSchema = DetailRecordViewSchema
}
if (this.isRendered()) {
- this.getButtonsView()?.reRender();
- this.getEditButtonsView()?.reRender();
+ this.reRenderButtons();
}
}
@@ -2895,15 +2891,15 @@ class DetailRecordView<S extends DetailRecordViewSchema = DetailRecordViewSchema
this.buttonEditList.push(item);
}
+
+
// noinspection JSUnusedGlobalSymbols
/**
* @deprecated Use `enableActionItems`.
*/
enableButtons() {
this.allActionItemsDisabled = false;
-
- this.getButtonsView()?.reRender();
- this.getEditButtonsView()?.reRender();
+ this.reRenderButtons();
}
// noinspection JSUnusedGlobalSymbols
@@ -2913,8 +2909,7 @@ class DetailRecordView<S extends DetailRecordViewSchema = DetailRecordViewSchema
disableButtons() {
this.allActionItemsDisabled = true;
- this.getButtonsView()?.reRender();
- this.getEditButtonsView()?.reRender();
+ this.reRenderButtons();
}
/**
@@ -2952,7 +2947,7 @@ class DetailRecordView<S extends DetailRecordViewSchema = DetailRecordViewSchema
return;
}
- this.getButtonsView()?.reRender();
+ this.reRenderButtons();
}
/**
@@ -3836,6 +3831,11 @@ class DetailRecordView<S extends DetailRecordViewSchema = DetailRecordViewSchema
private getEditButtonsView(): DetailRecordButtonsView | null {
return this.getView<DetailRecordButtonsView>('editButtons');
}
+
+ private reRenderButtons() {
+ this.getButtonsView()?.reRender({buffer: true});
+ this.getEditButtonsView()?.reRender({buffer: true});
+ }
}
export default DetailRecordView;
diff --git a/package-lock.json b/package-lock.json
index b51e66ebc4..1cf819c109 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,7 @@
"bootstrap": "github:yurikuzn/espo-bootstrap#0.1.2",
"bootstrap-colorpicker": "^2.5.2",
"bootstrap-datepicker": "^1.9.0",
- "bullbone": "github:espocrm/bullbone#1.4.7",
+ "bullbone": "github:espocrm/bullbone#1.5.0",
"cronstrue": "^1.114.0",
"cropper": "^0.7.9",
"devbridge-autocomplete": "^1.4.11",
@@ -3453,8 +3453,8 @@
}
},
"node_modules/bullbone": {
- "version": "1.4.7",
- "resolved": "git+ssh://[email protected]/espocrm/bullbone.git#10ff58eef56f1650fa06381171894f8f65fbb12c",
+ "version": "1.5.0",
+ "resolved": "git+ssh://[email protected]/espocrm/bullbone.git#5ea798f379a1194734a3e4a07d02d55a25e91b35",
"license": "AGPL",
"dependencies": {
"snabbdom": "^3.6.3"
@@ -11019,8 +11019,8 @@
"dev": true
},
"bullbone": {
- "version": "git+ssh://[email protected]/espocrm/bullbone.git#10ff58eef56f1650fa06381171894f8f65fbb12c",
- "from": "bullbone@github:espocrm/bullbone#1.4.7",
+ "version": "git+ssh://[email protected]/espocrm/bullbone.git#5ea798f379a1194734a3e4a07d02d55a25e91b35",
+ "from": "bullbone@github:espocrm/bullbone#1.5.0",
"requires": {
"snabbdom": "^3.6.3"
}
diff --git a/package.json b/package.json
index 9e807109c4..026bba38f7 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
"bootstrap": "github:yurikuzn/espo-bootstrap#0.1.2",
"bootstrap-colorpicker": "^2.5.2",
"bootstrap-datepicker": "^1.9.0",
- "bullbone": "github:espocrm/bullbone#1.4.7",
+ "bullbone": "github:espocrm/bullbone#1.5.0",
"cronstrue": "^1.114.0",
"cropper": "^0.7.9",
"devbridge-autocomplete": "^1.4.11",