|
|
@ -225,18 +225,21 @@ function rcube_webmail()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (this.env.action == 'compose') {
|
|
|
|
else if (this.env.action == 'compose') {
|
|
|
|
this.enable_command('send-attachment', 'remove-attachment', 'send', 'toggle-editor', true);
|
|
|
|
this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'toggle-editor'];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (this.env.drafts_mailbox)
|
|
|
|
|
|
|
|
this.env.compose_commands.push('savedraft')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.enable_command(this.env.compose_commands, 'identities', true);
|
|
|
|
|
|
|
|
|
|
|
|
if (this.env.spellcheck) {
|
|
|
|
if (this.env.spellcheck) {
|
|
|
|
this.env.spellcheck.spelling_state_observer = function(s){ ref.set_spellcheck_state(s); };
|
|
|
|
this.env.spellcheck.spelling_state_observer = function(s){ ref.set_spellcheck_state(s); };
|
|
|
|
|
|
|
|
this.env.compose_commands.push('spellcheck')
|
|
|
|
this.set_spellcheck_state('ready');
|
|
|
|
this.set_spellcheck_state('ready');
|
|
|
|
if ($("input[name='_is_html']").val() == '1')
|
|
|
|
if ($("input[name='_is_html']").val() == '1')
|
|
|
|
this.display_spellcheck_controls(false);
|
|
|
|
this.display_spellcheck_controls(false);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (this.env.drafts_mailbox)
|
|
|
|
|
|
|
|
this.enable_command('savedraft', true);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
document.onmouseup = function(e){ return p.doc_mouse_up(e); };
|
|
|
|
document.onmouseup = function(e){ return p.doc_mouse_up(e); };
|
|
|
|
|
|
|
|
|
|
|
|
// init message compose form
|
|
|
|
// init message compose form
|
|
|
@ -425,8 +428,7 @@ function rcube_webmail()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// check input before leaving compose step
|
|
|
|
// check input before leaving compose step
|
|
|
|
if (this.task=='mail' && this.env.action=='compose'
|
|
|
|
if (this.task=='mail' && this.env.action=='compose' && $.inArray(command, this.env.compose_commands)<0) {
|
|
|
|
&& (command == 'list' || command == 'mail' || command == 'addressbook' || command == 'settings')) {
|
|
|
|
|
|
|
|
if (this.cmp_hash != this.compose_field_hash() && !confirm(this.get_label('notsentwarning')))
|
|
|
|
if (this.cmp_hash != this.compose_field_hash() && !confirm(this.get_label('notsentwarning')))
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -974,11 +976,11 @@ function rcube_webmail()
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 'identities':
|
|
|
|
case 'identities':
|
|
|
|
this.goto_url('identities');
|
|
|
|
this.goto_url('settings/identities');
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
case 'folders':
|
|
|
|
case 'folders':
|
|
|
|
this.goto_url('folders');
|
|
|
|
this.goto_url('settings/folders');
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
// unified command call (command name == function name)
|
|
|
|
// unified command call (command name == function name)
|
|
|
@ -2942,8 +2944,10 @@ function rcube_webmail()
|
|
|
|
sig_separator = this.env.sig_above && (this.env.compose_mode == 'reply' || this.env.compose_mode == 'forward') ? '---' : '-- ';
|
|
|
|
sig_separator = this.env.sig_above && (this.env.compose_mode == 'reply' || this.env.compose_mode == 'forward') ? '---' : '-- ';
|
|
|
|
|
|
|
|
|
|
|
|
// enable manual signature insert
|
|
|
|
// enable manual signature insert
|
|
|
|
if (this.env.signatures && this.env.signatures[id])
|
|
|
|
if (this.env.signatures && this.env.signatures[id]) {
|
|
|
|
this.enable_command('insert-sig', true);
|
|
|
|
this.enable_command('insert-sig', true);
|
|
|
|
|
|
|
|
this.env.compose_commands.push('insert-sig');
|
|
|
|
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
this.enable_command('insert-sig', false);
|
|
|
|
this.enable_command('insert-sig', false);
|
|
|
|
|
|
|
|
|
|
|
|