 |
 |
 |
 |
|
|
Date: 01/07/01
- Next message: uw: "[phplib-dev] cvs commit"
- 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: Mon Jan 8 02:00:17 2001
Added files:
php-lib/php/form/form_textedit_iframe.html
Modified files:
php-lib/php/form/form.inc
php-lib/php/form/form_element.inc
php-lib/php/form/form_element_calendar.inc
php-lib/php/form/form_element_combo.inc
php-lib/php/form/form_element_date.inc
Log message:
New element: Textedit, simple MSHTML text editor using and IFrame. IE4+ only.
Index: php-lib/php/form/form.inc
diff -u php-lib/php/form/form.inc:1.18 php-lib/php/form/form.inc:1.19
--- php-lib/php/form/form.inc:1.18 Sat Jan 6 02:02:53 2001
+++ php-lib/php/form/form.inc Mon Jan 8 01:59:40 2001
@@ -26,7 +26,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.18 2001/01/06 01:02:53 uw Exp $
+* <email protected> $Id: form.inc,v 1.19 2001/01/08 00:59:40 uw Exp $
* <email protected> public
* <email protected> Form
*/
@@ -831,6 +831,7 @@
if ("" == $this->js_name)
return "";
+ $nolanguage = "";
// get a list of custom javascript validators
$validators = $this->getCustomValidators();
@@ -858,9 +859,14 @@
foreach ($this->elements as $name => $el) {
// all kinds of additional JS code
- list($extra_func, $extra_fname) = $el->getExtraJS();
+ list($extra_func, $extra_fname, $language) = $el->getExtraJS();
if ($extra_fname && !isset($send_func[$extra_fname])) {
- $base_code = $base_code . "\n" . $extra_func . ";";
+
+ if (!$language)
+ $nolanguage .= $extra_func .";\n";
+ else
+ $base_code = $base_code . "\n" . $extra_func . ";";
+
$send_func[$extra_fname] = true;
}
@@ -906,7 +912,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);
@@ -924,6 +930,9 @@
$js
);
+ if ($nolanguage)
+ $js .= sprintf('<script>%s</script>', $nolanguage);
+
return $js;
} // end func getJS
Index: php-lib/php/form/form_element.inc
diff -u php-lib/php/form/form_element.inc:1.8 php-lib/php/form/form_element.inc:1.9
--- php-lib/php/form/form_element.inc:1.8 Sat Jan 6 02:02:54 2001
+++ php-lib/php/form/form_element.inc Mon Jan 8 01:59:43 2001
@@ -3,7 +3,7 @@
* Superclass of all form elements.
*
* <email protected> Ulf Wendel <uw <email protected>>
-* <email protected> $Id: form_element.inc,v 1.8 2001/01/06 01:02:54 uw Exp $
+* <email protected> $Id: form_element.inc,v 1.9 2001/01/08 00:59:43 uw Exp $
* <email protected> public
* <email protected> Form
* <email protected>
@@ -801,10 +801,10 @@
* The function returns the JavaScript code itself and a name for the code
* snippet that allows the form object to avoid sending the code twice.
*
- * <email protected> array [JavaScript code, JavaScript code snippet name]
+ * <email protected> array [JavaScript code, JavaScript code snippet name, Script language]
*/
function getExtraJS() {
- return array("", "");
+ return array("", "", "JavaScript1.2");
}
/**
Index: php-lib/php/form/form_element_calendar.inc
diff -u php-lib/php/form/form_element_calendar.inc:1.2 php-lib/php/form/form_element_calendar.inc:1.3
--- php-lib/php/form/form_element_calendar.inc:1.2 Sat Jan 6 02:02:55 2001
+++ php-lib/php/form/form_element_calendar.inc Mon Jan 8 01:59:44 2001
@@ -6,7 +6,7 @@
* Maybe someone would like to add new features to it.
*
* <email protected> Ulf Wendel <ulf.wendel <email protected>>
-* <email protected> $Id: form_element_calendar.inc,v 1.2 2001/01/06 01:02:55 uw Exp $
+* <email protected> $Id: form_element_calendar.inc,v 1.3 2001/01/08 00:59:44 uw Exp $
* <email protected> Form
*/
class form_element_calendar extends form_element {
@@ -449,7 +449,7 @@
$this->form_name
);
- return array($js, "form_calendar");
+ return array($js, "form_calendar", "JavaScript1.2");
} // end func getExtraJS
} // end class form_element_calendar
Index: php-lib/php/form/form_element_combo.inc
diff -u php-lib/php/form/form_element_combo.inc:1.9 php-lib/php/form/form_element_combo.inc:1.10
--- php-lib/php/form/form_element_combo.inc:1.9 Sat Jan 6 02:02:56 2001
+++ php-lib/php/form/form_element_combo.inc Mon Jan 8 01:59:44 2001
@@ -4,7 +4,7 @@
*
* <email protected> Ulf Wendel <uw <email protected>>
* <email protected> Form
-* <email protected> $Id: form_element_combo.inc,v 1.9 2001/01/06 01:02:56 uw Exp $
+* <email protected> $Id: form_element_combo.inc,v 1.10 2001/01/08 00:59:44 uw Exp $
*/
class form_element_combo extends form_element_selectobject {
@@ -399,7 +399,7 @@
$this->form_name
);
- return array($js, "form_combo_add");
+ return array($js, "form_combo_add", "JavaScript1.2");
} // end func getExtraJS
function getJSValue() {
Index: php-lib/php/form/form_element_date.inc
diff -u php-lib/php/form/form_element_date.inc:1.8 php-lib/php/form/form_element_date.inc:1.9
--- php-lib/php/form/form_element_date.inc:1.8 Sat Jan 6 02:02:56 2001
+++ php-lib/php/form/form_element_date.inc Mon Jan 8 01:59:45 2001
@@ -5,7 +5,7 @@
* Use this meta element to make sure that the user enters a valid date.
*
* <email protected> Ulf Wendel <uw <email protected>>
-* <email protected> $Id: form_element_date.inc,v 1.8 2001/01/06 01:02:56 uw Exp $
+* <email protected> $Id: form_element_date.inc,v 1.9 2001/01/08 00:59:45 uw Exp $
* <email protected> Form
*/
class form_element_date extends form_element {
@@ -476,7 +476,7 @@
$this->form_name
);
- return array($js, "form_date_now");
+ return array($js, "form_date_now", "JavaScript1.2");
} // end func getExtraJS
} // end class form_elements_date
---------------------------------------------------------------------
To unsubscribe, e-mail: phplib-dev-unsubscribe <email protected>
For additional commands, e-mail: phplib-dev-help <email protected>
- Next message: uw: "[phplib-dev] cvs commit"
- Previous message: uw: "[phplib-dev] cvs commit"
- Next in thread: uw: "[phplib-dev] cvs commit"
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]