Skip to content

Commit 40cf983

Browse files
committed
Fixed bug that caused the wrong list to be loaded when the return key was pressed in a search text field of a list.
1 parent add36e9 commit 40cf983

File tree

4 files changed

+30
-5
lines changed

4 files changed

+30
-5
lines changed

interface/web/themes/default/templates/main.tpl.htm

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,14 @@
6868
jQuery(document).ready(function() {
6969
loadInitContent();
7070
});
71-
71+
72+
73+
jQuery(document).bind("change", function(event) {
74+
if ($(".panel #Filter").length > 0 && event.target.localName == 'select') {
75+
$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
76+
}
77+
});
78+
7279
//Use jQuery submit with kespress Enter in panel filterbar
7380
jQuery(document).bind("keypress", function(event) {
7481
if (event.which == '13' && $(".panel #Filter").length > 0) {
@@ -117,7 +124,7 @@ <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
117124
<div id="col3_content" class="clearfix">
118125
<a id="content" name="content"></a>
119126
<!-- skiplink anchor: Content -->
120-
<form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm">
127+
<form method="post" action="" id="pageForm" name="pageForm" enctype="multipart/form-data" class="uniForm" onSubmit="return false;">
121128
<div id="pageContent"><!-- AJAX CONTENT --></div>
122129
</form>
123130
</div>

interface/web/themes/default_64_navimg/templates/main.tpl.htm

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@
7070
loadInitContent();
7171
});
7272

73+
jQuery(document).bind("change", function(event) {
74+
if ($(".panel #Filter").length > 0 && event.target.localName == 'select') {
75+
$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
76+
}
77+
});
78+
7379
//Use jQuery submit with kespress Enter in panel filterbar
7480
jQuery(document).bind("keypress", function(event) {
7581
if (event.which == '13' && $(".panel #Filter").length > 0) {

interface/web/themes/default_combobox/templates/main.tpl.htm

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,16 @@
7272
loadInitContent();
7373
});
7474

75+
jQuery(document).bind("change", function(event) {
76+
if ($(".panel #Filter").length > 0 && event.target.localName == 'select') {
77+
$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
78+
}
79+
});
80+
7581
//Use jQuery submit with kespress Enter in panel filterbar
76-
jQuery(".panel .list input").live("keypress", function(event) {
77-
if (event.which == '13' && $(this).parents("tr").find("#Filter")) {
78-
$(this).parents("tr").find("#Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
82+
jQuery(document).bind("keypress", function(event) {
83+
if (event.which == '13' && $(".panel #Filter").length > 0) {
84+
$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
7985
}
8086
});
8187

interface/web/themes/default_no_navimg/templates/main.tpl.htm

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@
7070
loadInitContent();
7171
});
7272

73+
jQuery(document).bind("change", function(event) {
74+
if ($(".panel #Filter").length > 0 && event.target.localName == 'select') {
75+
$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
76+
}
77+
});
78+
7379
//Use jQuery submit with kespress Enter in panel filterbar
7480
jQuery(document).bind("keypress", function(event) {
7581
if (event.which == '13' && $(".panel #Filter").length > 0) {

0 commit comments

Comments
 (0)