Skip to content

EspoCRM – Open Source CRM Application

trigger change on control+enter save

Yuri Kuznetsove0e80c5a56d2
diff --git a/client/src/views/admin/layouts/modals/panel-attributes.js b/client/src/views/admin/layouts/modals/panel-attributes.js
index b84b1dfc9f..1e5ee87d27 100644
--- a/client/src/views/admin/layouts/modals/panel-attributes.js
+++ b/client/src/views/admin/layouts/modals/panel-attributes.js
@@ -44,6 +44,10 @@ export default class LayoutPanelAttributesView extends ModalView {
shortcutKeys = {
/** @this LayoutPanelAttributesView */
'Control+Enter': function (e) {
+ if (document.activeElement instanceof HTMLInputElement) {
+ document.activeElement.dispatchEvent(new Event('change', {bubbles: true}));
+ }
+
this.actionSave();
e.preventDefault();
diff --git a/client/src/views/admin/link-manager/modals/edit.js b/client/src/views/admin/link-manager/modals/edit.js
index 66b5f950bb..9d3911b8d8 100644
--- a/client/src/views/admin/link-manager/modals/edit.js
+++ b/client/src/views/admin/link-manager/modals/edit.js
@@ -49,6 +49,10 @@ class LinkManagerEditModalView extends ModalView {
},
/** @this LinkManagerEditModalView */
'Control+Enter': function (e) {
+ if (document.activeElement instanceof HTMLInputElement) {
+ document.activeElement.dispatchEvent(new Event('change', {bubbles: true}));
+ }
+
this.save();
e.preventDefault();
diff --git a/client/src/views/dashlets/options/base.js b/client/src/views/dashlets/options/base.js
index 4cc01ab2f4..e3da748309 100644
--- a/client/src/views/dashlets/options/base.js
+++ b/client/src/views/dashlets/options/base.js
@@ -56,7 +56,9 @@ class BaseDashletOptionsModalView extends ModalView {
shortcutKeys = {
/** @this BaseDashletOptionsModalView */
- 'Control+Enter': 'save',
+ 'Control+Enter': function (e) {
+ this.handleShortcutKeyCtrlEnter(e);
+ },
/** @this BaseDashletOptionsModalView */
'Escape': function (e) {
if (this.saveDisabled) {
@@ -235,6 +237,21 @@ class BaseDashletOptionsModalView extends ModalView {
this.getRecordView().showField(name);
}
+
+ /**
+ * @protected
+ * @param {KeyboardEvent} e
+ */
+ handleShortcutKeyCtrlEnter(e) {
+ e.preventDefault();
+ e.stopPropagation();
+
+ if (document.activeElement instanceof HTMLInputElement) {
+ document.activeElement.dispatchEvent(new Event('change', {bubbles: true}));
+ }
+
+ this.actionSave();
+ }
}
export default BaseDashletOptionsModalView;
diff --git a/client/src/views/fields/base.js b/client/src/views/fields/base.js
index 9b31495f52..e26f42c67b 100644
--- a/client/src/views/fields/base.js
+++ b/client/src/views/fields/base.js
@@ -1407,6 +1407,11 @@ class BaseFieldView extends View {
if (key === 'Control+Enter') {
e.stopPropagation();
+ if (document.activeElement instanceof HTMLInputElement) {
+ // Fields may need to fetch data first.
+ document.activeElement.dispatchEvent(new Event('change', {bubbles: true}));
+ }
+
this.fetchToModel();
this.inlineEditSave();
diff --git a/client/src/views/modals/edit.js b/client/src/views/modals/edit.js
index 22f80f0ed6..fe469d8bf7 100644
--- a/client/src/views/modals/edit.js
+++ b/client/src/views/modals/edit.js
@@ -66,6 +66,11 @@ class EditModalView extends ModalView {
e.preventDefault();
e.stopPropagation();
+ if (document.activeElement instanceof HTMLInputElement) {
+ // Fields may need to fetch data first.
+ document.activeElement.dispatchEvent(new Event('change', {bubbles: true}));
+ }
+
this.actionSave();
},
/** @this EditModalView */
diff --git a/client/src/views/record/detail.js b/client/src/views/record/detail.js
index 54443c6a40..9c4df845a9 100644
--- a/client/src/views/record/detail.js
+++ b/client/src/views/record/detail.js
@@ -3990,6 +3990,11 @@ class DetailRecordView extends BaseRecordView {
e.preventDefault();
e.stopPropagation();
+ if (document.activeElement instanceof HTMLInputElement) {
+ // Fields may need to fetch data first.
+ document.activeElement.dispatchEvent(new Event('change', {bubbles: true}));
+ }
+
const methodName = 'action' + Espo.Utils.upperCaseFirst(action);
this[methodName]();