Thread: [Pieforms-commit] SF.net SVN: pieforms: [79] pieforms-php5/trunk/src/pieform/elements
Status: Alpha
Brought to you by:
oracleshinoda
From: <ora...@us...> - 2006-12-07 05:34:45
|
Revision: 79 http://svn.sourceforge.net/pieforms/?rev=79&view=rev Author: oracleshinoda Date: 2006-12-06 21:34:36 -0800 (Wed, 06 Dec 2006) Log Message: ----------- The element_attributes method is now part of the class instead of static, so it can add it's own name to the ID for an element Modified Paths: -------------- pieforms-php5/trunk/src/pieform/elements/hidden.php pieforms-php5/trunk/src/pieform/elements/radio.php Modified: pieforms-php5/trunk/src/pieform/elements/hidden.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/hidden.php 2006-12-07 05:32:18 UTC (rev 78) +++ pieforms-php5/trunk/src/pieform/elements/hidden.php 2006-12-07 05:34:36 UTC (rev 79) @@ -32,8 +32,6 @@ * @return string The HTML for the element */ function pieform_render_hidden($element, Pieform $form) { - // @todo use the exclude parameter of element_attributes for this - unset($element['tabindex']); $value = $form->get_value($element); if (is_array($value)) { $result = ''; @@ -44,7 +42,7 @@ return $result; } return '<input type="hidden"' - . Pieform::element_attributes($element) + . $form->element_attributes($element, array('accesskey', 'onclick', 'size', 'style', 'tabindex')) . ' value="' . Pieform::hsc($form->get_value($element)) . "\">\n"; } Modified: pieforms-php5/trunk/src/pieform/elements/radio.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/radio.php 2006-12-07 05:32:18 UTC (rev 78) +++ pieforms-php5/trunk/src/pieform/elements/radio.php 2006-12-07 05:34:36 UTC (rev 79) @@ -49,7 +49,7 @@ $uid = $id . substr(md5(microtime()), 0, 4); $element['id'] = $uid; $result .= '<input type="radio"' - . Pieform::element_attributes($element) + . $form->element_attributes($element) . ' value="' . Pieform::hsc($value) . '"' . (($form_value == $value) ? ' checked="checked"' : '') . "> <label for=\"$uid\">" . Pieform::hsc($text) . "</label>$separator"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ora...@us...> - 2006-12-07 05:45:58
|
Revision: 81 http://svn.sourceforge.net/pieforms/?rev=81&view=rev Author: oracleshinoda Date: 2006-12-06 21:39:15 -0800 (Wed, 06 Dec 2006) Log Message: ----------- The element_attributes method is now part of the class instead of static, so it can add it's own name to the ID for an element Modified Paths: -------------- pieforms-php5/trunk/src/pieform/elements/button.php pieforms-php5/trunk/src/pieform/elements/file.php pieforms-php5/trunk/src/pieform/elements/select.php pieforms-php5/trunk/src/pieform/elements/submit.php pieforms-php5/trunk/src/pieform/elements/textarea.php pieforms-php5/trunk/src/pieform/elements/wysiwyg.php Modified: pieforms-php5/trunk/src/pieform/elements/button.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/button.php 2006-12-07 05:36:09 UTC (rev 80) +++ pieforms-php5/trunk/src/pieform/elements/button.php 2006-12-07 05:39:15 UTC (rev 81) @@ -38,7 +38,7 @@ throw new PieformException('Button elements must have a value'); } return '<input type="button"' - . Pieform::element_attributes($element) + . $form->element_attributes($element) . ' value="' . Pieform::hsc($element['value']) . '">'; } Modified: pieforms-php5/trunk/src/pieform/elements/file.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/file.php 2006-12-07 05:36:09 UTC (rev 80) +++ pieforms-php5/trunk/src/pieform/elements/file.php 2006-12-07 05:39:15 UTC (rev 81) @@ -33,7 +33,7 @@ */ function pieform_render_file($element, Pieform $form) { return '<input type="file"' - . Pieform::element_attributes($element) . '>'; + . $form->element_attributes($element) . '>'; } function pieform_get_value_file($element, Pieform $form) { Modified: pieforms-php5/trunk/src/pieform/elements/select.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/select.php 2006-12-07 05:36:09 UTC (rev 80) +++ pieforms-php5/trunk/src/pieform/elements/select.php 2006-12-07 05:39:15 UTC (rev 81) @@ -44,7 +44,7 @@ } $result = '<select' - . Pieform::element_attributes($element) + . $form->element_attributes($element) . (!empty($element['multiple']) ? ' multiple="multiple"' : '') . ">\n"; if (!isset($element['options']) || !is_array($element['options']) || count($element['options']) < 1) { Modified: pieforms-php5/trunk/src/pieform/elements/submit.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/submit.php 2006-12-07 05:36:09 UTC (rev 80) +++ pieforms-php5/trunk/src/pieform/elements/submit.php 2006-12-07 05:39:15 UTC (rev 81) @@ -33,7 +33,7 @@ */ function pieform_render_submit($element, Pieform $form) { return '<input type="submit"' - . Pieform::element_attributes($element) + . $form->element_attributes($element) . ' value="' . Pieform::hsc($form->get_value($element)) . '">'; } Modified: pieforms-php5/trunk/src/pieform/elements/textarea.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/textarea.php 2006-12-07 05:36:09 UTC (rev 80) +++ pieforms-php5/trunk/src/pieform/elements/textarea.php 2006-12-07 05:39:15 UTC (rev 81) @@ -58,7 +58,7 @@ return '<textarea' . (($rows) ? ' rows="' . $rows . '"' : '') . (($cols) ? ' cols="' . $cols . '"' : '') - . Pieform::element_attributes($element, array('maxlength', 'size')) + . $form->element_attributes($element, array('maxlength', 'size')) . '>' . Pieform::hsc($form->get_value($element)) . '</textarea>'; } Modified: pieforms-php5/trunk/src/pieform/elements/wysiwyg.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/wysiwyg.php 2006-12-07 05:36:09 UTC (rev 80) +++ pieforms-php5/trunk/src/pieform/elements/wysiwyg.php 2006-12-07 05:39:15 UTC (rev 81) @@ -62,7 +62,7 @@ return '<textarea' . (($rows) ? ' rows="' . $rows . '"' : '') . (($cols) ? ' cols="' . $cols . '"' : '') - . Pieform::element_attributes($element, array('maxlength', 'size')) + . $form->element_attributes($element, array('maxlength', 'size')) . '>' . Pieform::hsc($form->get_value($element)) . '</textarea>'; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ora...@us...> - 2006-12-07 05:49:04
|
Revision: 82 http://svn.sourceforge.net/pieforms/?rev=82&view=rev Author: oracleshinoda Date: 2006-12-06 21:41:51 -0800 (Wed, 06 Dec 2006) Log Message: ----------- The element_attributes method is now part of the class instead of static, so it can add it's own name to the ID for an element Modified Paths: -------------- pieforms-php5/trunk/src/pieform/elements/cancel.php pieforms-php5/trunk/src/pieform/elements/checkbox.php pieforms-php5/trunk/src/pieform/elements/image.php pieforms-php5/trunk/src/pieform/elements/text.php Modified: pieforms-php5/trunk/src/pieform/elements/cancel.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/cancel.php 2006-12-07 05:39:15 UTC (rev 81) +++ pieforms-php5/trunk/src/pieform/elements/cancel.php 2006-12-07 05:41:51 UTC (rev 82) @@ -38,7 +38,7 @@ throw new PieformException('Cancel elements must have a value'); } - $attributes = Pieform::element_attributes($element); + $attributes = $form->element_attributes($element); $attributes = preg_replace('/name="(.*)"/', 'name="cancel_$1"', $attributes); $attributes = preg_replace('/id="(.*)"/', 'id="cancel_$1"', $attributes); return '<input type="submit"' Modified: pieforms-php5/trunk/src/pieform/elements/checkbox.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/checkbox.php 2006-12-07 05:39:15 UTC (rev 81) +++ pieforms-php5/trunk/src/pieform/elements/checkbox.php 2006-12-07 05:41:51 UTC (rev 82) @@ -46,7 +46,7 @@ } return '<input type="checkbox"' - . Pieform::element_attributes($element) + . $form->element_attributes($element) . ($checked ? ' checked="checked"' : '') . '>'; } Modified: pieforms-php5/trunk/src/pieform/elements/image.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/image.php 2006-12-07 05:39:15 UTC (rev 81) +++ pieforms-php5/trunk/src/pieform/elements/image.php 2006-12-07 05:41:51 UTC (rev 82) @@ -33,7 +33,7 @@ */ function pieform_render_image($element, Pieform $form) { return '<input type="image" src="' . Pieform::hsc($element['src']) . '"' - . Pieform::element_attributes($element) + . $form->element_attributes($element) . ' value="' . Pieform::hsc($form->get_value($element)) . '">'; } Modified: pieforms-php5/trunk/src/pieform/elements/text.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/text.php 2006-12-07 05:39:15 UTC (rev 81) +++ pieforms-php5/trunk/src/pieform/elements/text.php 2006-12-07 05:41:51 UTC (rev 82) @@ -33,7 +33,7 @@ */ function pieform_render_text($element, $form) { return '<input type="text"' - . Pieform::element_attributes($element) + . $form->element_attributes($element) . ' value="' . Pieform::hsc($form->get_value($element)) . '">'; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ora...@us...> - 2006-12-23 03:50:33
|
Revision: 112 http://svn.sourceforge.net/pieforms/?rev=112&view=rev Author: oracleshinoda Date: 2006-12-22 19:50:31 -0800 (Fri, 22 Dec 2006) Log Message: ----------- Updated elements to new API Modified Paths: -------------- pieforms-php5/trunk/src/pieform/elements/fieldset.php pieforms-php5/trunk/src/pieform/elements/password.php pieforms-php5/trunk/src/pieform/elements/radio.php Modified: pieforms-php5/trunk/src/pieform/elements/fieldset.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/fieldset.php 2006-12-23 03:48:43 UTC (rev 111) +++ pieforms-php5/trunk/src/pieform/elements/fieldset.php 2006-12-23 03:50:31 UTC (rev 112) @@ -28,11 +28,11 @@ * Renders a fieldset. Fieldsets contain other elements, and do not count as a * "true" element, in that they do not have a value and cannot be validated. * - * @param array $element The element to render - * @param Pieform $form The form to render the element for - * @return string The HTML for the element + * @param Pieform $form The form to render the element for + * @param array $element The element to render + * @return string The HTML for the element */ -function pieform_render_fieldset($element, Pieform $form) { +function pieform_element_fieldset(Pieform $form, $element) { $result = "\n<fieldset>\n"; if (isset($element['legend'])) { $result .= '<legend>' . Pieform::hsc($element['legend']) . "</legend>\n"; @@ -42,7 +42,7 @@ if ($subelement['type'] == 'hidden') { throw new PieformError("You cannot put hidden elements in fieldsets"); } - $result .= "\t" . pieform_render_element($subelement, $form); + $result .= "\t" . pieform_render_element($form, $subelement); } $result .= "</fieldset>\n"; Modified: pieforms-php5/trunk/src/pieform/elements/password.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/password.php 2006-12-23 03:48:43 UTC (rev 111) +++ pieforms-php5/trunk/src/pieform/elements/password.php 2006-12-23 03:50:31 UTC (rev 112) @@ -31,14 +31,14 @@ * @param Pieform $form The form to render the element for * @return string The HTML for the element */ -function pieform_render_password($element, Pieform $form) { +function pieform_element_password(Pieform $form, $element) { return '<input type="password"' . $form->element_attributes($element) . ' value="' . Pieform::hsc($form->get_value($element)) . '">'; } -function pieform_get_value_password($element, Pieform $form) { - $global = ($form->get_method() == 'get') ? $_GET : $_POST; +function pieform_element_password_get_value(Pieform $form, $element) { + $global = ($form->get_property('method') == 'get') ? $_GET : $_POST; if (isset($global[$element['name']])) { return $global[$element['name']]; } Modified: pieforms-php5/trunk/src/pieform/elements/radio.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/radio.php 2006-12-23 03:48:43 UTC (rev 111) +++ pieforms-php5/trunk/src/pieform/elements/radio.php 2006-12-23 03:50:31 UTC (rev 112) @@ -31,7 +31,7 @@ * @param Pieform $form The form to render the element for * @return string The HTML for the element */ -function pieform_render_radio($element, Pieform $form) { +function pieform_element_radio(Pieform $form, $element) { if (!isset($element['options']) || !is_array($element['options']) || count($element['options']) < 1) { throw new PieformException('Radio elements should have at least one option'); } @@ -59,25 +59,7 @@ return $result; } -/** - * radio doesn't need a function to get a value from phpland because it comes - * through correctly from the request... however in javascript land things are - * harder. - * - * @todo maybe later: make the get_value_js functions return a javascript function, - * to keep their stuff in its own scope. Maybe. If js scoping rules mean this will help. - */ -function pieform_get_value_js_radio($element, Pieform $form) { - $formname = $form->get_name(); - $name = $element['name']; - return <<<EOF - var radio = filter(function(radio) { return radio.checked; }, document.forms['$formname'].elements['$name']); - data['$name'] = radio[0].value; - -EOF; -} - -function pieform_render_radio_set_attributes($element) { +function pieform_element_radio_set_attributes($element) { $element['nolabel'] = true; $element['rules']['validateoptions'] = true; return $element; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ora...@us...> - 2006-12-23 04:09:14
|
Revision: 124 http://svn.sourceforge.net/pieforms/?rev=124&view=rev Author: oracleshinoda Date: 2006-12-22 20:09:15 -0800 (Fri, 22 Dec 2006) Log Message: ----------- Updated to use new APIs. Modified Paths: -------------- pieforms-php5/trunk/src/pieform/elements/cancel.php pieforms-php5/trunk/src/pieform/elements/text.php Modified: pieforms-php5/trunk/src/pieform/elements/cancel.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/cancel.php 2006-12-23 04:08:19 UTC (rev 123) +++ pieforms-php5/trunk/src/pieform/elements/cancel.php 2006-12-23 04:09:15 UTC (rev 124) @@ -29,11 +29,11 @@ * normal submit buttons, only their name is changed (for use by the Pieform * class internally). * - * @param array $element The element to render * @param Pieform $form The form to render the element for + * @param array $element The element to render * @return string The HTML for the element */ -function pieform_render_cancel($element, Pieform $form) { +function pieform_element_cancel(Pieform $form, $element) { if (!isset($element['value'])) { throw new PieformException('Cancel elements must have a value'); } @@ -46,14 +46,9 @@ . ' value="' . Pieform::hsc($element['value']) . '">'; } -// @todo how to support cancel buttons for ajax post? Possibly do a full post regardless... -// or allow the user to specify a javascript function to run... it could do document.location= -// @todo also, cancel buttons don't need to be sent around via js... maybe make this return empty string -function pieform_get_value_js_cancel($element, Pieform $form) { - //$formname = $form->get_name(); - //$name = $element['name']; - //return " data['{$name}_cancel'] = document.forms['$formname'].elements['{$name}_cancel'].value;\n"; - return ''; +function pieform_element_cancel_set_attributes($element) { + $element['ajaxmessages'] = true; + return $element; } ?> Modified: pieforms-php5/trunk/src/pieform/elements/text.php =================================================================== --- pieforms-php5/trunk/src/pieform/elements/text.php 2006-12-23 04:08:19 UTC (rev 123) +++ pieforms-php5/trunk/src/pieform/elements/text.php 2006-12-23 04:09:15 UTC (rev 124) @@ -27,11 +27,11 @@ /** * Provides a basic text field input. * + * @param Pieform $form The form to render the element for * @param array $element The element to render - * @param Pieform $form The form to render the element for * @return string The HTML for the element */ -function pieform_render_text($element, $form) { +function pieform_element_text(Pieform $form, $element) { return '<input type="text"' . $form->element_attributes($element) . ' value="' . Pieform::hsc($form->get_value($element)) . '">'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |