Skip to content

EspoCRM – Open Source CRM Application

rename

Yuri Kuznetsov8f2ccb45a24f
diff --git a/client/src/views/modal.js b/client/src/views/modal.js
index 2e540e67ea..f6a08fa6d3 100644
--- a/client/src/views/modal.js
+++ b/client/src/views/modal.js
@@ -72,7 +72,7 @@ class ModalView extends View {
* @property {'static'|boolean} [backdrop] A backdrop.
* @property {module:views/modal~Button} [buttonList] Buttons.
* @property {module:views/modal~Button} [dropdownItemList] Buttons.
- * @property {boolean} [collapseDisabled] Not collapsable. As of v9.1.0.
+ * @property {boolean} [collapseDisabled] Not collapsible. As of v9.1.0.
*/
/**
@@ -234,7 +234,7 @@ class ModalView extends View {
* @protected
* @type {boolean}
*/
- isCollapsable = false
+ isCollapsible = false
/**
* Is maximizable.
@@ -326,7 +326,7 @@ class ModalView extends View {
}
if (this.options.collapseDisabled) {
- this.isCollapsable = false;
+ this.isCollapsible = false;
}
this.on('render', () => {
@@ -387,7 +387,7 @@ class ModalView extends View {
screenWidthXs: this.getThemeManager().getParam('screenWidthXs'),
fixedHeaderHeight: this.fixedHeaderHeight,
closeButton: !this.noCloseButton,
- collapseButton: this.isCollapsable,
+ collapseButton: this.isCollapsible,
maximizeButton: this.isMaximizable && !this.getHelper().isXsScreen(),
onRemove: () => this.onDialogClose(),
onBackdropClick: () => this.onBackdropClick(),
@@ -436,7 +436,7 @@ class ModalView extends View {
$(this.containerSelector).remove();
});
- if (this.isCollapsable) {
+ if (this.isCollapsible) {
this.addActionHandler('collapseModal', () => this.collapse());
}
diff --git a/client/src/views/modals/compose-email.js b/client/src/views/modals/compose-email.js
index e6450285fe..cb515f87ea 100644
--- a/client/src/views/modals/compose-email.js
+++ b/client/src/views/modals/compose-email.js
@@ -36,7 +36,7 @@ class ComposeEmailModalView extends EditModalView {
layoutName = 'composeSmall'
saveDisabled = true
fullFormDisabled = true
- isCollapsable = true
+ isCollapsible = true
wasModified = false
shortcutKeys = {
diff --git a/client/src/views/modals/detail.js b/client/src/views/modals/detail.js
index ec9e32ef4e..563c9f4fc9 100644
--- a/client/src/views/modals/detail.js
+++ b/client/src/views/modals/detail.js
@@ -663,7 +663,7 @@ class DetailModalView extends ModalView {
},
});
- // Not to hidden as it interferes with the collapsable modal.
+ // Not to be hidden as it interferes with the collapsible modal.
//this.dialog.hide();
return modalView;
diff --git a/client/src/views/modals/edit.js b/client/src/views/modals/edit.js
index 51613edace..31e66cbe43 100644
--- a/client/src/views/modals/edit.js
+++ b/client/src/views/modals/edit.js
@@ -52,7 +52,7 @@ class EditModalView extends ModalView {
/** @protected */
bottomDisabled = false
- isCollapsable = true
+ isCollapsible = true
/**
* @private
diff --git a/client/src/views/site/navbar.js b/client/src/views/site/navbar.js
index 5b626712a2..fc8e836b44 100644
--- a/client/src/views/site/navbar.js
+++ b/client/src/views/site/navbar.js
@@ -264,7 +264,7 @@ class NavbarSiteView extends View {
/**
* @private
*/
- isCollapsableVisible() {
+ isCollapsibleVisible() {
return this.$el.find('.navbar-body').hasClass('in');
}
@@ -272,7 +272,7 @@ class NavbarSiteView extends View {
* @private
*/
toggleCollapsable() {
- if (this.isCollapsableVisible()) {
+ if (this.isCollapsibleVisible()) {
this.hideCollapsable();
} else {
this.showCollapsable();