From 4928cf685492ae3abe1b2ddad5cf6cacf670efb0 Mon Sep 17 00:00:00 2001
From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Sat, 19 Nov 2005 23:48:19 +0000
Subject: [PATCH]  r8979@llin:  dpavlin | 2005-11-20 00:39:43 +0100  another
 fix for checkboxes, added textarea, checkbox and radio buttons to  tests

git-svn-id: svn+ssh://mjesec/home/dpavlin/svn/webpac2/trunk@69 07558da8-63fa-0310-ba24-9fe276d99e06
---
 web/iwf/iwfajax.js              |  7 +++++--
 web/iwf/testers/iwfajax.html    | 12 +++++++++++-
 web/iwf/testers/iwfajaxpost.php | 12 +++++++++++-
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/web/iwf/iwfajax.js b/web/iwf/iwfajax.js
index d68e5c8..d6d5806 100644
--- a/web/iwf/iwfajax.js
+++ b/web/iwf/iwfajax.js
@@ -275,9 +275,12 @@ function _iwfGetFormData(form, url, ctl){
 				case 'input':
 					switch(iwfAttribute(el, 'type')){
 						case 'checkbox':
+							if (iwfAttribute(el, 'checked')){
+								val = 'on';
+							}
 						case 'radio':
-							if (iwfAttribute(el, 'checked') || el.checked){
-								val = iwfAttribute(el, 'value') || el.value;
+							if (iwfAttribute(el, 'checked')){
+								val = iwfAttribute(el, 'value');
 							}
 							break;
 						case 'button':
diff --git a/web/iwf/testers/iwfajax.html b/web/iwf/testers/iwfajax.html
index f087cd8..befdc97 100644
--- a/web/iwf/testers/iwfajax.html
+++ b/web/iwf/testers/iwfajax.html
@@ -76,11 +76,21 @@
 		<a href='javascript:iwfMoveTo("moveme", 0, 0, 20); iwfShowGently("moveme", 5)'>reset orange box</a><br />
 		<form action='iwfajaxpost.php' method='get' name='frmGet' iwfTarget='formSubmitResults'>
 			<input type='hidden' value='hidden get value' name='hidValue' />
+			<textarea name="textarea_content" cols="30" rows="2">sample text area content</textarea>
+			<br/><input type="checkbox" name="checkbox_test" /> checkbox
+			<br/><input type="radio" name="radio_test" value="first radio button"> first
+			<br/><input type="radio" name="radio_test" value="second radio button"> second
+			<br/>
 			<input type='button' value='HTTP GET'  name='btnGet' onclick='javascript:iwfRequest(this);' />
 			<a href='javascript:iwfRequest("frmGet")'> GET via anchor</a>
 		</form>
 		<form action='iwfajaxpost.php' method='post' id='frmPost' iwfTarget='formSubmitResults'>
 			<input type='hidden' value='hidden post value' name='hidValue' />
+			<textarea name="textarea_content" cols="30" rows="2">sample text area content</textarea>
+			<br/><input type="checkbox" name="checkbox_test" /> checkbox
+			<br/><input type="radio" name="radio_test" value="first radio button"> first
+			<br/><input type="radio" name="radio_test" value="second radio button"> second
+			<br/>
 			<input type='button' value='HTTP POST'  name='btnPost' onclick='javascript:iwfRequest(this);' />
 			<a href='javascript:iwfRequest("frmPost", "formSubmitResults")'> POST via anchor</a>
 		</form>
@@ -94,4 +104,4 @@
 			If they show up here, there is problems!  iwfTarget is not being recognized...
 		</div>
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/web/iwf/testers/iwfajaxpost.php b/web/iwf/testers/iwfajaxpost.php
index a4d775d..1e57615 100644
--- a/web/iwf/testers/iwfajaxpost.php
+++ b/web/iwf/testers/iwfajaxpost.php
@@ -1,9 +1,19 @@
 <?
 require_once('../php/iwf.php');
+
+$now = gmdate("D, d M Y H:i:s");
+
+header( "Expires: Mon, 20 Dec 1998 01:00:00 GMT" );
+header( "Last-Modified: $now GMT" );
+header( "Cache-Control: no-cache, must-revalidate" );
+header( "Pragma: no-cache" );
+
 $iwf->popup($iwfTarget);
 $iwf->startHtml($iwfTarget);
 $iwf->pretty(true);
 
+echo "Generated on $now GMT<br/>";
+
 echo "<h1>GET</h1>";
 
 foreach($_GET as $key => $val){
@@ -21,4 +31,4 @@ echo $GLOBALS['HTTP_RAW_POST_DATA'] . "<br />";
 $iwf->endHtml(true);
 
 
-?>
\ No newline at end of file
+?>
-- 
2.20.1