 |
 |
 |
 |
|
|
Date: 05/22/01
- Next message: Martin Spevak: "[phplib-dev] database connect to session"
- Previous message: uw: "[phplib-dev] cvs commit"
- Next in thread: uw: "[phplib-dev] cvs commit"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
From: uw
Date: Tue May 22 21:44:09 2001
Added files:
php-lib/pages/form/xml/tests/form_file.php
php-lib/pages/form/xml/tests/form_file.xml
php-lib/pages/form/xml/tests/form_fileupload.php
php-lib/pages/form/xml/tests/form_fileupload.xml
Modified files:
php-lib/php/form/form.inc
php-lib/php/form/form_commonobject.inc
php-lib/php/form/elements/form_element.inc
php-lib/php/form/elements/form_element_combo.inc
php-lib/php/form/elements/form_element_date.inc
php-lib/php/form/js/form_js_complex.js
Log message:
- added file xml example
- added fileupload xml example
- don't know about the others :/
Index: php-lib/php/form/form.inc
diff -u php-lib/php/form/form.inc:1.34 php-lib/php/form/form.inc:1.35
--- php-lib/php/form/form.inc:1.34 Sun May 20 19:20:49 2001
+++ php-lib/php/form/form.inc Tue May 22 21:43:36 2001
@@ -28,7 +28,7 @@
* - tree (select box with options show as a tree)
*
* <email protected> Ulf Wendel <ulf.wendel <email protected>>
-* <email protected> $Id: form.inc,v 1.34 2001/05/20 17:20:49 uw Exp $
+* <email protected> $Id: form.inc,v 1.35 2001/05/22 19:43:36 uw Exp $
* <email protected> public
* <email protected> Form
*/
@@ -932,11 +932,10 @@
$custom .= $js_validator . "\n";
// remove the element name prefix
- $js .= str_replace($el->getName(), str_replace($this->element_prefix, "", $el->getName()), $eldata);
-
+ $elname = str_replace($this->element_prefix, "", $el->getName());
+ $js .= str_replace($el->getName(), $elname, $eldata);
+
if ($getvalue_fname) {
-
- $elname = $el->getName();
// don't send radio entries twice
if (!isset($send_gv_el[$elname])) {
Index: php-lib/php/form/form_commonobject.inc
diff -u php-lib/php/form/form_commonobject.inc:1.6 php-lib/php/form/form_commonobject.inc:1.7
--- php-lib/php/form/form_commonobject.inc:1.6 Sun May 20 16:05:31 2001
+++ php-lib/php/form/form_commonobject.inc Tue May 22 21:43:37 2001
@@ -15,14 +15,14 @@
* <email protected> string $CR_HTML Default is "\n"
* <email protected> CR_JS
*/
- var $CR_HTML = "";
+ var $CR_HTML = "\n";
/**
* Line break sign used whenever JavaScript code is generated
* <email protected> string $CR_JS Default is "\n"
* <email protected> CR_HTML
*/
- var $CR_JS = "";
+ var $CR_JS = "\n";
/**
* Variable containing the latest exception object.
Index: php-lib/php/form/elements/form_element.inc
diff -u php-lib/php/form/elements/form_element.inc:1.7 php-lib/php/form/elements/form_element.inc:1.8
--- php-lib/php/form/elements/form_element.inc:1.7 Sun May 20 16:05:32 2001
+++ php-lib/php/form/elements/form_element.inc Tue May 22 21:43:37 2001
@@ -5,7 +5,7 @@
* Superclass of all form elements.
*
* <email protected> Ulf Wendel <uw <email protected>>
-* <email protected> $Id: form_element.inc,v 1.7 2001/05/20 14:05:32 uw Exp $
+* <email protected> $Id: form_element.inc,v 1.8 2001/05/22 19:43:37 uw Exp $
* <email protected> public
* <email protected> Form
* <email protected>
@@ -779,7 +779,7 @@
// Select / Intro validation: "i", "intro", "intro_e"
if ($this->doValidation("intro")) {
-
+
reset($this->intro);
list($intro_value, $intro_label) = each($this->intro);
Index: php-lib/php/form/elements/form_element_combo.inc
diff -u php-lib/php/form/elements/form_element_combo.inc:1.4 php-lib/php/form/elements/form_element_combo.inc:1.5
--- php-lib/php/form/elements/form_element_combo.inc:1.4 Fri May 11 22:53:17 2001
+++ php-lib/php/form/elements/form_element_combo.inc Tue May 22 21:43:38 2001
@@ -1,12 +1,13 @@
<?php
require_once(FORM_INCLUDE_DIR . "/elements/form_element_selectobject.inc");
+require_once(FORM_INCLUDE_DIR . "/elements/form_element_select.inc");
/**
* Generates a new metatype combo box
*
* <email protected> Ulf Wendel <uw <email protected>>
* <email protected> Form
-* <email protected> $Id: form_element_combo.inc,v 1.4 2001/05/11 20:53:17 uw Exp $
+* <email protected> $Id: form_element_combo.inc,v 1.5 2001/05/22 19:43:38 uw Exp $
*/
class form_element_combo extends form_element_selectobject {
Index: php-lib/php/form/elements/form_element_date.inc
diff -u php-lib/php/form/elements/form_element_date.inc:1.7 php-lib/php/form/elements/form_element_date.inc:1.8
--- php-lib/php/form/elements/form_element_date.inc:1.7 Mon May 21 21:28:41 2001
+++ php-lib/php/form/elements/form_element_date.inc Tue May 22 21:43:38 2001
@@ -6,7 +6,7 @@
*
* Use this meta element to make sure that the user enters a valid date.
*
-* <email protected> $Id: form_element_date.inc,v 1.7 2001/05/21 19:28:41 uw Exp $
+* <email protected> $Id: form_element_date.inc,v 1.8 2001/05/22 19:43:38 uw Exp $
*/
class form_element_date extends form_element_dateobject {
Index: php-lib/php/form/js/form_js_complex.js
diff -u php-lib/php/form/js/form_js_complex.js:1.2 php-lib/php/form/js/form_js_complex.js:1.3
--- php-lib/php/form/js/form_js_complex.js:1.2 Sun May 20 16:05:35 2001
+++ php-lib/php/form/js/form_js_complex.js Tue May 22 21:43:39 2001
@@ -53,12 +53,12 @@
m = this.err.join("");
if (!f && m)
- f = (s) ? s : el;
+ f = (s) ? s : this.p + el;
}
if (m) {
alert("{ERROR_MSG_PREFIX}" + m + "{ERROR_MSG_POSTFIX}");
- document.forms[n].elements[this.p + f].focus();
+ document.forms[n].elements[f].focus();
return false;
}
return true;
@@ -70,6 +70,7 @@
for (i = 0; i < g.length; i+= 2)
if (g[i] == el)
return eval(g[i +1] + "('" + f.name + "', '" + this.p + el + "');");
+
return [document.forms[f.name].elements[this.p + el].value, ""];
};
---------------------------------------------------------------------
To unsubscribe, e-mail: phplib-dev-unsubscribe <email protected>
For additional commands, e-mail: phplib-dev-help <email protected>
- Next message: Martin Spevak: "[phplib-dev] database connect to session"
- Previous message: uw: "[phplib-dev] cvs commit"
- Next in thread: uw: "[phplib-dev] cvs commit"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]