From 87a30c474398ce667b6c761b8f25e1886be54e61 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Thu, 07 Jun 2012 11:00:16 -0400
Subject: [PATCH] - Forms can now be submitted by hitting ENTER in all input fields (except textarea).
---
interface/lib/classes/tform_actions.inc.php | 3 ++-
interface/web/themes/default_no_navimg/templates/main.tpl.htm | 14 +++++++++-----
interface/web/themes/default/templates/main.tpl.htm | 14 +++++++++-----
interface/web/themes/default_combobox/templates/main.tpl.htm | 14 +++++++++-----
interface/web/themes/default_64_navimg/templates/main.tpl.htm | 14 +++++++++-----
5 files changed, 38 insertions(+), 21 deletions(-)
diff --git a/interface/lib/classes/tform_actions.inc.php b/interface/lib/classes/tform_actions.inc.php
index 5c03b27..39cdb49 100644
--- a/interface/lib/classes/tform_actions.inc.php
+++ b/interface/lib/classes/tform_actions.inc.php
@@ -216,9 +216,10 @@
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']);
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 311ee87..24866fc 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/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>
diff --git a/interface/web/themes/default_64_navimg/templates/main.tpl.htm b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
index 0ad9525..d2b9a0d 100644
--- a/interface/web/themes/default_64_navimg/templates/main.tpl.htm
+++ b/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>
diff --git a/interface/web/themes/default_combobox/templates/main.tpl.htm b/interface/web/themes/default_combobox/templates/main.tpl.htm
index 140aab4..cff8229 100644
--- a/interface/web/themes/default_combobox/templates/main.tpl.htm
+++ b/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');
}
});
diff --git a/interface/web/themes/default_no_navimg/templates/main.tpl.htm b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
index 316e9ed..ed6b3cb 100644
--- a/interface/web/themes/default_no_navimg/templates/main.tpl.htm
+++ b/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');
}
});
--
Gitblit v1.9.1