fix(Tinebase): ctrl+enter might change data before closeing window

tine20 · May 12, 2022 · 997d5dc · 997d5dc
1 parent d8bbb2e
commit 997d5dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tine20/Tinebase/js/widgets/dialog/EditDialog.js b/tine20/Tinebase/js/widgets/dialog/EditDialog.js
@@ -1138,7 +1138,7 @@ Tine.widgets.dialog.EditDialog = Ext.extend(Ext.FormPanel, {
                         // force set last selected field
                         this.getForm().items.each(function(item) {
                             if (item.hasFocus) {
-                                item.setValue(item.getRawValue(), this.record);
+                                item.onBlur();
                             }
                         }, this);
                     }

diff --git a/tine20/Tinebase/js/widgets/form/PasswordTriggerField.js b/tine20/Tinebase/js/widgets/form/PasswordTriggerField.js
@@ -82,7 +82,7 @@ Tine.Tinebase.widgets.form.PasswordTriggerField = Ext.extend(Ext.form.TwinTrigge
         if (e.type === 'keydown' && e.keyCode === 229) return _.defer(_.bind(this.transformIMEInput, this, e));
         if (e.type === 'keydown' && _.indexOf([8 /* BACKSPACE */, 46 /* DELETE */], e.keyCode) < 0) return;
         if (e.type === 'keypress' && e.metaKey /* APPLE CMD */ && e.keyCode == 118 /* v */) return;
-        if (e.type === 'keypress' && _.indexOf([13 /* ENTER */], e.keyCode) >= 0) return;
+        if (e.type === 'keypress' && _.indexOf([13, /* ENTER */ 10 /* CTRL+ENTER */], e.keyCode) >= 0) return;
         Ext.lib.Event.stopEvent(e);
 
         clearTimeout(this.selectTextTimeout);