Skip to content

Commit b6c04b1

Browse files
author
mcramer
committed
Fixed: ajax request is submitted twice on pressing enter (theme default and default-v2)
1 parent e75e35b commit b6c04b1

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,20 @@
4848

4949
jQuery(document).bind("change", function(event) {
5050
if (jQuery(".panel #Filter").length > 0 && event.target.localName == 'select') {
51-
jQuery(".panel #Filter").trigger('click');
51+
event.preventDefault();
52+
jQuery(".panel #Filter").trigger('click');
5253
}
5354
});
5455

5556
jQuery(document).bind("keypress", function(event) {
5657
//Use jQuery submit with keypress Enter in panel filterbar
5758
if (event.which == '13' && jQuery(".panel #Filter").length > 0) {
59+
event.preventDefault();
5860
jQuery(".panel #Filter").trigger('click');
5961
}
6062
//Use jQuery submit with keypress Enter in forms
6163
if (event.which == '13' && jQuery(".pnl_formsarea button.positive").length > 0 && event.target.localName != 'textarea') {
64+
event.preventDefault();
6265
jQuery(".pnl_formsarea button.positive:first").trigger('click');
6366
}
6467
});
@@ -107,4 +110,4 @@ <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name=
107110
</footer><!-- end: footer -->
108111
</div>
109112
</body>
110-
</html>
113+
</html>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,20 @@
9898

9999
jQuery(document).bind("change", function(event) {
100100
if (jQuery(".panel #Filter").length > 0 && event.target.localName == 'select') {
101+
event.preventDefault();
101102
jQuery(".panel #Filter").trigger('click');
102103
}
103104
});
104105

105106
jQuery(document).bind("keypress", function(event) {
106107
//Use jQuery submit with keypress Enter in panel filterbar
107108
if (event.which == '13' && jQuery(".panel #Filter").length > 0) {
109+
event.preventDefault();
108110
jQuery(".panel #Filter").trigger('click');
109111
}
110112
//Use jQuery submit with keypress Enter in forms
111113
if (event.which == '13' && jQuery(".pnl_formsarea button.positive").length > 0 && event.target.localName != 'textarea') {
114+
event.preventDefault();
112115
jQuery(".pnl_formsarea button.positive:first").trigger('click');
113116
}
114117
});
@@ -171,4 +174,4 @@ <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name=
171174
</div>
172175
</div>
173176
</body>
174-
</html>
177+
</html>

0 commit comments

Comments
 (0)