From: uw
Date: Sat May 19 20:07:44 2001
Modified files:
php-lib/php/form/form.inc
php-lib/php/form/elements/form_element.inc
php-lib/php/form/elements/form_element_date.inc
php-lib/php/form/elements/form_element_radio.inc
php-lib/php/form/elements/form_element_select.inc
php-lib/php/form/js/form_js_simple.js
Log message:
- fixed a javascript bug
Index: php-lib/php/form/form.inc
diff -u php-lib/php/form/form.inc:1.28 php-lib/php/form/form.inc:1.29
--- php-lib/php/form/form.inc:1.28 Sun May 13 20:54:36 2001
+++ php-lib/php/form/form.inc Sat May 19 20:07:09 2001
@@ -28,7 +28,7 @@
* - tree (select box with options show as a tree)
*
* @author Ulf Wendel <[EMAIL PROTECTED]>
-* @version $Id: form.inc,v 1.28 2001/05/13 18:54:36 uw Exp $
+* @version $Id: form.inc,v 1.29 2001/05/19 18:07:09 uw Exp $
* @access public
* @package Form
*/
@@ -906,8 +906,8 @@
$elname = $el->getName();
// don't send radio entries twice
- if(!isset($send_gv_el[$elname])) {
- $get_value.= sprintf('"%s", "%s", ', $elname,
$getvalue_fname);
+ if (!isset($send_gv_el[$elname])) {
+ $get_value .= sprintf('"%s", "%s", ',
+$elname, $getvalue_fname);
$send_gv_el[$elname] = true;
}
@@ -936,7 +936,7 @@
$js = sprintf('[%s]', substr($js, 0, -2));
// ;-) compress the JS code....
- $base_code = $this->compressJS($base_code);
+ #$base_code = $this->compressJS($base_code);
// customize the error message
$base_code = str_replace("{ERROR_MSG_PREFIX}", $this->js_error_prefix,
$base_code);
@@ -982,6 +982,7 @@
// remove spaces and tabs
$code = preg_replace($search, $meta, $code);
$code = preg_replace("/[ \t]/", "", $code);
+ $code = preg_replace("/[\n][\r]*/", "\n", $code);
// remove some newlines
$tmp = array();
@@ -989,9 +990,9 @@
$j = 0;
foreach ($code as $k => $line) {
if (strlen($tmp[$j]) < 120)
- $tmp[$j] .= $line;
+ $tmp[$j] .= trim($line);
else
- $tmp[++$j] = $line;
+ $tmp[++$j] = trim($line);
}
$code = implode("\n", $tmp);
Index: php-lib/php/form/elements/form_element.inc
diff -u php-lib/php/form/elements/form_element.inc:1.3
php-lib/php/form/elements/form_element.inc:1.4
--- php-lib/php/form/elements/form_element.inc:1.3 Fri May 11 22:53:17 2001
+++ php-lib/php/form/elements/form_element.inc Sat May 19 20:07:10 2001
@@ -5,7 +5,7 @@
* Superclass of all form elements.
*
* @author Ulf Wendel <[EMAIL PROTECTED]>
-* @version $Id: form_element.inc,v 1.3 2001/05/11 20:53:17 uw Exp $
+* @version $Id: form_element.inc,v 1.4 2001/05/19 18:07:10 uw Exp $
* @access public
* @package Form
* @abstract
@@ -210,7 +210,7 @@
*
All other values start JavaScript
validation with "onSubmit".
*/
function form_element ($element_data, $method, $form_name = "", $js_mode = "") {
-
+$this->ed = $element_data;
$ok = $this->checkConfiguration($element_data);
if (!$ok)
return;
@@ -750,8 +750,12 @@
// Select / Intro validation: "i", "intro", "intro_e"
if ($this->doValidation("intro")) {
+
+ reset($this->intro);
+ list($intro_value, $intro_label) = each($this->intro);
+
$eldata .= sprintf('"i", "%s", "%s", ',
-
$this->intro,
+
+ $intro_value,
str_replace('"', '\"', $this->intro_e)
);
$events .= "i";
Index: php-lib/php/form/elements/form_element_date.inc
diff -u php-lib/php/form/elements/form_element_date.inc:1.3
php-lib/php/form/elements/form_element_date.inc:1.4
--- php-lib/php/form/elements/form_element_date.inc:1.3 Thu May 10 22:47:09 2001
+++ php-lib/php/form/elements/form_element_date.inc Sat May 19 20:07:10 2001
@@ -7,7 +7,7 @@
* Use this meta element to make sure that the user enters a valid date.
*
* @author Ulf Wendel <[EMAIL PROTECTED]>
-* @version $Id: form_element_date.inc,v 1.3 2001/05/10 20:47:09 uw Exp $
+* @version $Id: form_element_date.inc,v 1.4 2001/05/19 18:07:10 uw Exp $
* @package Form
*/
class form_element_date extends form_element {
@@ -427,21 +427,19 @@
function getJSvalue() {
$js = 'function form_date(f, e) {
- var v = s = n = "";
+ var v = n = "";
var i = j = 0;
with (document.forms[f])
for ( ; i < length; i++) {
n = elements[i].name;
if (-1 != n.search(new RegExp(e + "_[aAdDFhHgGijlmnMswYyz]")))
{
- if (!s)
- s = n;
with (elements[i])
for (j = 0; j < options.length; j++)
if (options[j].selected)
v += options[j].value;
}
}
- return [v, s];
+ return v;
}';
return array($js, "form_date");
Index: php-lib/php/form/elements/form_element_radio.inc
diff -u php-lib/php/form/elements/form_element_radio.inc:1.3
php-lib/php/form/elements/form_element_radio.inc:1.4
--- php-lib/php/form/elements/form_element_radio.inc:1.3 Thu May 10 22:47:11
2001
+++ php-lib/php/form/elements/form_element_radio.inc Sat May 19 20:07:11 2001
@@ -5,7 +5,7 @@
* Generation of radio elements, [input type="radio" value=""].
*
* @author Ulf Wendel <[EMAIL PROTECTED]>
-* @version $Id: form_element_radio.inc,v 1.3 2001/05/10 20:47:11 uw Exp $
+* @version $Id: form_element_radio.inc,v 1.4 2001/05/19 18:07:11 uw Exp $
* @access public
* @package Form
*/
@@ -62,8 +62,8 @@
with (document.forms[f])
for (var i = t = 0, t = elements[e]; i < t.length; i++)
if (t[i].checked)
- return [t[i].value, ""];
- return ["", ""];
+ return t[i].value;
+ return "";
}', "form_radio");
} // end func getJSValue
Index: php-lib/php/form/elements/form_element_select.inc
diff -u php-lib/php/form/elements/form_element_select.inc:1.4
php-lib/php/form/elements/form_element_select.inc:1.5
--- php-lib/php/form/elements/form_element_select.inc:1.4 Fri May 11 22:53:18
2001
+++ php-lib/php/form/elements/form_element_select.inc Sat May 19 20:07:12 2001
@@ -6,7 +6,7 @@
*
* @author Ulf Wendel <[EMAIL PROTECTED]>
* @package Form
-* @version $Id: form_element_select.inc,v 1.4 2001/05/11 20:53:18 uw Exp $
+* @version $Id: form_element_select.inc,v 1.5 2001/05/19 18:07:12 uw Exp $
*/
class form_element_select extends form_element_selectobject {
@@ -64,8 +64,8 @@
with (document.forms[f].elements[e])
for (var i = o = 0, o = options; i < o.length; i++)
if (o[i].selected)
- return [o[i].value, ""];
- return ["", ""];
+ return o[i].value;
+ return "";
}', "form_select");
} // end func getJSvalue
Index: php-lib/php/form/js/form_js_simple.js
diff -u php-lib/php/form/js/form_js_simple.js:1.1
php-lib/php/form/js/form_js_simple.js:1.2
--- php-lib/php/form/js/form_js_simple.js:1.1 Thu May 10 18:16:26 2001
+++ php-lib/php/form/js/form_js_simple.js Sat May 19 20:07:13 2001
@@ -11,10 +11,11 @@
n = this.name;
d = this.els;
- for (i = 0; i < d.length; i += 2) {
+ for (i = 0; i < d.length; i += 2) {
el = d[i];
+
a = arguments;
- if (a.length && a[1].name != el)
+ if (a.length && a[0] != el)
continue;
vd = d[i + 1];
@@ -28,7 +29,7 @@
if ("v" == c)
eval("vl = " + vd[j - 3] + "('" + n + "', '" + el +
"'); j -= 2;");
-
+alert(vl);
l = vl.length;
if ("l" == c && (l < vd[j - 3] || (vd[j -2] >= 0 && l > vd[j -
2])))
e += vd[j - 1] + "\n";
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
