From b6c04b154d3226b363e37355942a933a5ba67608 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Fri, 24 Aug 2012 02:32:23 -0400
Subject: [PATCH] Fixed: ajax request is submitted twice on pressing enter (theme default and default-v2)

---
 interface/web/themes/default/templates/main.tpl.htm    |    5 ++++-
 interface/web/themes/default-v2/templates/main.tpl.htm |    7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/interface/web/themes/default-v2/templates/main.tpl.htm b/interface/web/themes/default-v2/templates/main.tpl.htm
index 647aa05..f5dff89 100644
--- a/interface/web/themes/default-v2/templates/main.tpl.htm
+++ b/interface/web/themes/default-v2/templates/main.tpl.htm
@@ -48,17 +48,20 @@
             
             jQuery(document).bind("change", function(event) {
                 if (jQuery(".panel #Filter").length > 0 && event.target.localName == 'select') {
-                    jQuery(".panel #Filter").trigger('click');
+                    event.preventDefault();
+		    jQuery(".panel #Filter").trigger('click');
                 }
             });
             
             jQuery(document).bind("keypress", function(event) {
                 //Use jQuery submit with keypress Enter in panel filterbar
                 if (event.which == '13' && jQuery(".panel #Filter").length > 0) {
+                    event.preventDefault();
                     jQuery(".panel #Filter").trigger('click');
                 }
                 //Use jQuery submit with keypress Enter in forms
                 if (event.which == '13' && jQuery(".pnl_formsarea button.positive").length > 0 && event.target.localName != 'textarea') {
+                    event.preventDefault();
                     jQuery(".pnl_formsarea button.positive:first").trigger('click');
                 }
             });
@@ -107,4 +110,4 @@
             </footer><!-- end: footer -->
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index a334ba9..9707eec 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -98,6 +98,7 @@
             
             jQuery(document).bind("change", function(event) {
                 if (jQuery(".panel #Filter").length > 0 && event.target.localName == 'select') {
+                    event.preventDefault();
                     jQuery(".panel #Filter").trigger('click');
                 }
             });
@@ -105,10 +106,12 @@
             jQuery(document).bind("keypress", function(event) {
                 //Use jQuery submit with keypress Enter in panel filterbar
                 if (event.which == '13' && jQuery(".panel #Filter").length > 0) {
+                    event.preventDefault();
                     jQuery(".panel #Filter").trigger('click');
                 }
                 //Use jQuery submit with keypress Enter in forms
                 if (event.which == '13' && jQuery(".pnl_formsarea button.positive").length > 0 && event.target.localName != 'textarea') {
+                    event.preventDefault();
                     jQuery(".pnl_formsarea button.positive:first").trigger('click');
                 }
             });
@@ -171,4 +174,4 @@
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>

--
Gitblit v1.9.1