Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added "[labs] allow_ctrl_enter_on_compose = false" setting (Closes #387)

Browse source
This commit is contained in:
RainLoop Team 2014-12-18 01:11:58 +04:00
parent e4b286e257
commit 453bcb969e
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
dev/View/Popup/Compose.js
View file

@ -1063,10 +1063,13 @@
return false; return false;
}); });
// key('ctrl+enter, command+enter', Enums.KeyState.Compose, function () { if (!!Settings.settingsGet('AllowСtrlEnterOnCompose'))
// self.sendCommand(); {
// return false; key('ctrl+enter, command+enter', Enums.KeyState.Compose, function () {
// }); self.sendCommand();
return false;
});
}
key('esc', Enums.KeyState.Compose, function () { key('esc', Enums.KeyState.Compose, function () {
if (self.modalVisibility()) if (self.modalVisibility())
@ -1204,7 +1207,7 @@
window.gapi.load('auth', {'callback': function () { window.gapi.load('auth', {'callback': function () {
var var
oAuthToken = window.gapi.auth.getToken(), oAuthToken = window.gapi.auth.getToken(),
fResult = function (oAuthResult) { fResult = function (oAuthResult) {
if (oAuthResult && !oAuthResult.error) if (oAuthResult && !oAuthResult.error)

1
rainloop/v/0.0.0/app/src/RainLoop/Actions.php
View file

@ -1063,6 +1063,7 @@ class Actions
'AllowAdminPanel' => (bool) $oConfig->Get('security', 'allow_admin_panel', true), 'AllowAdminPanel' => (bool) $oConfig->Get('security', 'allow_admin_panel', true),
'AllowHtmlEditorSourceButton' => (bool) $oConfig->Get('labs', 'allow_html_editor_source_button', false), 'AllowHtmlEditorSourceButton' => (bool) $oConfig->Get('labs', 'allow_html_editor_source_button', false),
'AllowHtmlEditorBitiButtons' => (bool) $oConfig->Get('labs', 'allow_html_editor_biti_buttons', false), 'AllowHtmlEditorBitiButtons' => (bool) $oConfig->Get('labs', 'allow_html_editor_biti_buttons', false),
'AllowСtrlEnterOnCompose' => (bool) $oConfig->Get('labs', 'allow_ctrl_enter_on_compose', false),
'UseRsaEncryption' => (bool) $oConfig->Get('security', 'use_rsa_encryption', false), 'UseRsaEncryption' => (bool) $oConfig->Get('security', 'use_rsa_encryption', false),
'RsaPublicKey' => '', 'RsaPublicKey' => '',
'HideDangerousActions' => $oConfig->Get('labs', 'hide_dangerous_actions', false), 'HideDangerousActions' => $oConfig->Get('labs', 'hide_dangerous_actions', false),

1
rainloop/v/0.0.0/app/src/RainLoop/Config/Application.php
View file

@ -247,6 +247,7 @@ Enables caching in the system'),
'log_ajax_response_write_limit' => array(300), 'log_ajax_response_write_limit' => array(300),
'allow_html_editor_source_button' => array(false), 'allow_html_editor_source_button' => array(false),
'allow_html_editor_biti_buttons' => array(false), 'allow_html_editor_biti_buttons' => array(false),
'allow_ctrl_enter_on_compose' => array(false),
'hide_dangerous_actions' => array(false), 'hide_dangerous_actions' => array(false),
'use_app_debug_js' => array(false), 'use_app_debug_js' => array(false),
'use_app_debug_css' => array(false), 'use_app_debug_css' => array(false),