Skip to content

EspoCRM – Open Source CRM Application

element check cleanup

Yuri Kuznetsova71bf16c51b1
diff --git a/client/src/views/email/fields/body.js b/client/src/views/email/fields/body.js
index d44c861ef5..bf7ddaffec 100644
--- a/client/src/views/email/fields/body.js
+++ b/client/src/views/email/fields/body.js
@@ -90,10 +90,6 @@ class EmailBodyFieldView extends WysiwygFieldView {
afterRender() {
super.afterRender();
- if (!this.element) {
- return;
- }
-
this.controlInsertFieldButton();
if (this.isReadMode() && this.replyPart) {
diff --git a/client/src/views/fields/text.js b/client/src/views/fields/text.js
index 4fdcf69e47..cceca719a1 100644
--- a/client/src/views/fields/text.js
+++ b/client/src/views/fields/text.js
@@ -385,13 +385,11 @@ class TextFieldView extends BaseFieldView {
this.controlSeeMore();
});
- // Can be hidden.
// @todo Revise stream post with empty text.
- if (this.element) {
- this.element.querySelectorAll('img').forEach(image => {
- image.addEventListener('load', this.controlSeeMoreBind);
- });
- }
+
+ this.element.querySelectorAll('img').forEach(image => {
+ image.addEventListener('load', this.controlSeeMoreBind);
+ });
}
}
diff --git a/client/src/views/fields/varchar.js b/client/src/views/fields/varchar.js
index 2432e3f834..c57c52743e 100644
--- a/client/src/views/fields/varchar.js
+++ b/client/src/views/fields/varchar.js
@@ -141,6 +141,10 @@ class VarcharFieldView extends BaseFieldView {
this.events['click [data-action="copyToClipboard"]'] = () => this.copyToClipboard();
}
}
+
+ this.on('remove', () => {
+ this.searchMultiSelectInputElement = undefined;
+ });
}
/**
@@ -269,11 +273,6 @@ class VarcharFieldView extends BaseFieldView {
* @param {string} type
*/
handleSearchType(type) {
- if (!this.element) {
- // @todo Remove when handled by bullbone.
- return;
- }
-
const mainElement = this.element.querySelector('input.main-element');
const multiSelectContainer = this.element.querySelector('div[data-role="multi-select-container"]');
@@ -533,12 +532,6 @@ class VarcharFieldView extends BaseFieldView {
* @private
*/
initSearchMultiSelect() {
- if (!this.element) {
- this.searchMultiSelectInputElement = undefined;
-
- return;
- }
-
this.searchMultiSelectInputElement = this.element.querySelector('input[data-role="multi-select-input"]');
MultiSelect.init(this.searchMultiSelectInputElement, {
diff --git a/client/src/views/modals/image-preview.js b/client/src/views/modals/image-preview.js
index 2a6258cb78..5773b8e964 100644
--- a/client/src/views/modals/image-preview.js
+++ b/client/src/views/modals/image-preview.js
@@ -222,11 +222,6 @@ class ImagePreviewModalView extends ModalView {
}
afterRender() {
- if (!this.element) {
- // @todo Remove when views are not rendered, after change in bull.
- return;
- }
-
if (this.isMultiple()) {
/** @type {HTMLDivElement|null} */
const titleElement = this.dialog.getElement().querySelector('.modal-header .modal-title');