- Forms can now be submitted by hitting ENTER in all input fields (except textarea).

Author: falkotimme

interface/lib/classes/tform_actions.inc.php

@@ -216,9 +216,10 @@ function onInsert() {
                             header($redirect);
 							exit;
                         } elseif ($_SESSION["s"]["form"]["return_to_url"] != '') {
+							$redirect = $_SESSION["s"]["form"]["return_to_url"];
 							$_SESSION["s"]["form"]["return_to_url"] = '';
 							session_write_close();
-							header("Location: ".$_SESSION["s"]["form"]["return_to_url"]);
+							header("Location: ".$redirect);
 							exit;
 						} else {
                                 header("Location: ".$app->tform->formDef['list_default']);

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

@@ -97,15 +97,19 @@
 
 
 		jQuery(document).bind("change", function(event) {
-			if ($(".panel #Filter").length > 0 && event.target.localName == 'select') {
-				$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
+			if (jQuery(".panel #Filter").length > 0 && event.target.localName == 'select') {
+				jQuery(".panel #Filter").trigger('click');
 			}
 		});
 
-		//Use jQuery submit with keypress Enter in panel filterbar
 		jQuery(document).bind("keypress", function(event) {
-			if (event.which == '13' && $(".panel #Filter").length > 0) {
-				$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
+			//Use jQuery submit with keypress Enter in panel filterbar
+			if (event.which == '13' && jQuery(".panel #Filter").length > 0) {
+				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') {
+				jQuery(".pnl_formsarea button.positive:first").trigger('click');
 			}
 		});
 	</script>

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

@@ -97,15 +97,19 @@
 		});
 
 		jQuery(document).bind("change", function(event) {
-			if ($(".panel #Filter").length > 0 && event.target.localName == 'select') {
-				$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
+			if (jQuery(".panel #Filter").length > 0 && event.target.localName == 'select') {
+				jQuery(".panel #Filter").trigger('click');
 			}
 		});
 
-		//Use jQuery submit with keypress Enter in panel filterbar
 		jQuery(document).bind("keypress", function(event) {
-			if (event.which == '13' && $(".panel #Filter").length > 0) {
-				$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
+			//Use jQuery submit with keypress Enter in panel filterbar
+			if (event.which == '13' && jQuery(".panel #Filter").length > 0) {
+				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') {
+				jQuery(".pnl_formsarea button.positive:first").trigger('click');
 			}
 		});
 	</script>

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

@@ -98,8 +98,8 @@
 		});
 
 		jQuery(document).bind("change", function(event) {
-			if ($(".panel #Filter").length > 0 && event.target.localName == 'select') {
-				$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
+			if (jQuery(".panel #Filter").length > 0 && event.target.localName == 'select') {
+				jQuery(".panel #Filter").trigger('click');
 			}
 		});
 
@@ -109,10 +109,14 @@
 			}
 		});
 
-		//Use jQuery submit with keypress Enter in panel filterbar
 		jQuery(document).bind("keypress", function(event) {
-			if (event.which == '13' && $(".panel #Filter").length > 0) {
-				$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
+			//Use jQuery submit with keypress Enter in panel filterbar
+			if (event.which == '13' && jQuery(".panel #Filter").length > 0) {
+				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') {
+				jQuery(".pnl_formsarea button.positive:first").trigger('click');
 			}
 		});
 

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

@@ -97,15 +97,19 @@
 		});
 
 		jQuery(document).bind("change", function(event) {
-			if ($(".panel #Filter").length > 0 && event.target.localName == 'select') {
-				$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
+			if (jQuery(".panel #Filter").length > 0 && event.target.localName == 'select') {
+				jQuery(".panel #Filter").trigger('click');
 			}
 		});
 
-		//Use jQuery submit with keypress Enter in panel filterbar
 		jQuery(document).bind("keypress", function(event) {
-			if (event.which == '13' && $(".panel #Filter").length > 0) {
-				$(".panel #Filter").attr("onsubmit",$(".panel #Filter").attr("onclick")).submit();
+			//Use jQuery submit with keypress Enter in panel filterbar
+			if (event.which == '13' && jQuery(".panel #Filter").length > 0) {
+				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') {
+				jQuery(".pnl_formsarea button.positive:first").trigger('click');
 			}
 		});