Merge branch '6532_prevent_change_event_option' into 'develop'

6532_prevent_change_event_option

Closes #6532

See merge request ispconfig/ispconfig3!1763

Author: Till Brehm

interface/web/mail/templates/mail_user_mailfilter_edit.htm

@@ -1,6 +1,6 @@
 <div class="form-group">
 	<label class="col-sm-3 control-label">{tmpl_var name='move_junk_txt'}</label>
-	<div class="col-sm-9"><select name="move_junk" id="move_junk" class="form-control">
+	<div class="col-sm-9"><select name="move_junk" id="move_junk" class="disableChangeEvent form-control">
 	    {tmpl_var name='move_junk'}
 	</select></div>
 
@@ -31,7 +31,7 @@
 		</div>
 	</div>
 </div>
- 
+
 {tmpl_var name='filter_records'}
 
 <input type="hidden" name="id" value="{tmpl_var name='id'}">

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

@@ -112,7 +112,7 @@ var ISPConfig = {
 					else return escapeMarkup(o.text);
 				}
 			}).on('change', function(e) {
-				if ($("#pageForm .table #Filter").length > 0) {
+				if ($("#pageForm .table #Filter").length > 0 && ! $(this).hasClass("disableChangeEvent")) {
 					$("#pageForm .table #Filter").trigger('click');
 				}
 			});
@@ -599,7 +599,7 @@ var ISPConfig = {
 
 $(document).on("change", function(event) {
 	var elName = event.target.localName;
-	if ($("#pageForm .table #Filter").length > 0 && elName == 'select') {
+	if ($("#pageForm .table #Filter").length > 0 && elName == 'select' && ! $(event.target).hasClass("disableChangeEvent") ) {
 		event.preventDefault();
 		$("#pageForm .table #Filter").trigger('click');
 	}