Skip to content

Commit c7d28b8

Browse files
author
Till Brehm
committed
Merge branch '6694-expand-paste-to-selected-domains' into 'develop'
Introduce pasting of email address to select the domain also to mail forwards and aliases Closes #6694 See merge request ispconfig/ispconfig3!1887
2 parents 9a2ad93 + 815207c commit c7d28b8

File tree

4 files changed

+25
-3
lines changed

4 files changed

+25
-3
lines changed

interface/web/mail/templates/mail_alias_edit.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<label class="col-sm-3 control-label"><em>*</em> {tmpl_var name='email_txt'}</label>
33
<div class="col-sm-9">
44
<div class='input-group'>
5-
<input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" class="form-control" />
5+
<input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" class="form-control" onpaste="processEmailAddressInput(this)" onchange="updateEmailDomain(this)" />
66
<span class='input-group-addon'>@</span>
77
<div class='input-group-field'>
88
<select name="email_domain" id="email_domain" class="form-control" style="height:50px;min-width:170px;">{tmpl_var name='email_domain'}</select>

interface/web/mail/templates/mail_forward_edit.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<label class="col-sm-3 control-label"><em>*</em> {tmpl_var name='email_txt'}</label>
33
<div class="col-sm-9">
44
<div class='input-group'>
5-
<input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" class="form-control" />
5+
<input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" class="form-control" onpaste="processEmailAddressInput(this)" onchange="updateEmailDomain(this)" />
66
<span class='input-group-addon'>@</span>
77
<div class='input-group-field'>
88
<select name="email_domain" id="email_domain" class="form-control" style="height:50px;min-width:170px;">{tmpl_var name='email_domain'}</select>

interface/web/mail/templates/mail_user_mailbox_edit.htm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<label class="col-sm-3 control-label"><em>*</em> {tmpl_var name='email_txt'}</label>
77
<div class="col-sm-9">
88
<div class='input-group'>
9-
<input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" class="form-control" onPaste="javascript: e = this; setTimeout(function(){if (/@/.test(e.value)) { parts = e.value.split('@'); $('#email_domain').val(parts.pop()); $('#email_domain').trigger('change'); e.value=parts.pop(); } }, 4);" onChange="javascript: if (/@/.test(this.value)) { parts = this.value.split('@'); $('#email_domain').val(parts.pop()); $('#email_domain').trigger('change'); this.value=parts.pop(); } " />
9+
<input type="text" id="email_local_part" name="email_local_part" value="{tmpl_var name='email_local_part'}" class="form-control" onpaste="processEmailAddressInput(this)" onchange="updateEmailDomain(this)" />
1010
<span class='input-group-addon'>@</span>
1111
<div class='input-group-field'>
1212
<select name="email_domain" id="email_domain" class="form-control" style="height:50px;min-width:170px;">{tmpl_var name='email_domain'}</select>

interface/web/themes/default/assets/javascripts/ispconfig.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -841,3 +841,25 @@ $(document).ready(function() {
841841
});
842842

843843
});
844+
845+
846+
function processEmailAddressInput(e) {
847+
setTimeout(function () {
848+
if (/@/.test(e.value)) {
849+
var parts = e.value.split('@');
850+
$('#email_domain').val(parts.pop());
851+
$('#email_domain').trigger('change');
852+
e.value = parts.pop();
853+
}
854+
}, 4);
855+
};
856+
857+
function updateEmailDomain(e) {
858+
if (/@/.test(e.value)) {
859+
var parts = e.value.split('@');
860+
$('#email_domain').val(parts.pop());
861+
$('#email_domain').trigger('change');
862+
e.value = parts.pop();
863+
}
864+
};
865+

0 commit comments

Comments
 (0)