Permalink
Browse files

Merged repeat_element branch

git-svn-id: http://svn.php.net/repository/pear/packages/HTML_QuickForm2/trunk@325158 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information...
2 parents ac2756e + 073ef34 commit b255061f2693935c5b998b9361b97520055cd40d @sad-spirit sad-spirit committed Apr 13, 2012
Showing with 1,422 additions and 522 deletions.
  1. +5 −4 HTML/QuickForm2/Container.php
  2. +5 −3 HTML/QuickForm2/Container/Group.php
  3. +694 −0 HTML/QuickForm2/Container/Repeat.php
  4. +16 −13 HTML/QuickForm2/Element/Hierselect.php
  5. +1 −1 HTML/QuickForm2/Element/Input.php
  6. +4 −0 HTML/QuickForm2/Element/InputCheckbox.php
  7. +53 −13 HTML/QuickForm2/JavascriptBuilder.php
  8. +5 −3 HTML/QuickForm2/Renderer/Default.php
  9. +4 −0 data/quickform.css
  10. +17 −4 js/build.xml
  11. +299 −0 js/src/repeat.js
  12. +2 −0 tests/QuickForm2/Container/AllTests.php
  13. +0 −5 tests/QuickForm2/Container/FieldsetTest.php
  14. +0 −10 tests/QuickForm2/Container/GroupTest.php
  15. +206 −0 tests/QuickForm2/Container/RepeatTest.php
  16. +0 −16 tests/QuickForm2/ContainerOverloadTest.php
  17. +0 −20 tests/QuickForm2/ContainerTest.php
  18. +0 −9 tests/QuickForm2/Controller/Action/BackTest.php
  19. +0 −9 tests/QuickForm2/Controller/Action/DirectTest.php
  20. +0 −9 tests/QuickForm2/Controller/Action/DisplayTest.php
  21. +0 −9 tests/QuickForm2/Controller/Action/JumpTest.php
  22. +0 −9 tests/QuickForm2/Controller/Action/NextTest.php
  23. +0 −9 tests/QuickForm2/Controller/Action/SubmitTest.php
  24. +0 −6 tests/QuickForm2/Controller/PageTest.php
  25. +0 −9 tests/QuickForm2/ControllerTest.php
  26. +0 −5 tests/QuickForm2/DataSource/ArrayTest.php
  27. +0 −5 tests/QuickForm2/DataSource/SuperGlobalTest.php
  28. +2 −0 tests/QuickForm2/Element/AllTests.php
  29. +0 −10 tests/QuickForm2/Element/ButtonTest.php
  30. +0 −3 tests/QuickForm2/Element/DateTest.php
  31. +73 −0 tests/QuickForm2/Element/HierselectTest.php
  32. +0 −5 tests/QuickForm2/Element/InputButtonTest.php
  33. +0 −15 tests/QuickForm2/Element/InputCheckableTest.php
  34. +24 −10 tests/QuickForm2/Element/InputCheckboxTest.php
  35. +0 −13 tests/QuickForm2/Element/InputFileTest.php
  36. +0 −5 tests/QuickForm2/Element/InputHiddenTest.php
  37. +0 −10 tests/QuickForm2/Element/InputImageTest.php
  38. +0 −5 tests/QuickForm2/Element/InputPasswordTest.php
  39. +0 −5 tests/QuickForm2/Element/InputResetTest.php
  40. +0 −10 tests/QuickForm2/Element/InputSubmitTest.php
  41. +8 −5 tests/QuickForm2/Element/InputTest.php
  42. +0 −5 tests/QuickForm2/Element/SelectTest.php
  43. +0 −10 tests/QuickForm2/Element/StaticTest.php
  44. +0 −5 tests/QuickForm2/Element/TextareaTest.php
  45. +0 −10 tests/QuickForm2/ElementTest.php
  46. +2 −10 tests/QuickForm2/FactoryTest.php
  47. +0 −4 tests/QuickForm2/FilterTest.php
  48. +0 −17 tests/QuickForm2/JavascriptBuilderTest.php
  49. +0 −10 tests/QuickForm2/NodeTest.php
  50. +0 −10 tests/QuickForm2/Renderer/ArrayTest.php
  51. +0 −10 tests/QuickForm2/Renderer/CallbackTest.php
  52. +0 −10 tests/QuickForm2/Renderer/DefaultTest.php
  53. +0 −4 tests/QuickForm2/Renderer/StubTest.php
  54. +0 −10 tests/QuickForm2/RendererTest.php
  55. +0 −10 tests/QuickForm2/Rule/CallbackTest.php
  56. +0 −10 tests/QuickForm2/Rule/CompareTest.php
  57. +0 −6 tests/QuickForm2/Rule/EachTest.php
  58. +0 −7 tests/QuickForm2/Rule/EmailTest.php
  59. +0 −10 tests/QuickForm2/Rule/EmptyTest.php
  60. +0 −10 tests/QuickForm2/Rule/LengthTest.php
  61. +0 −10 tests/QuickForm2/Rule/MaxFileSizeTest.php
  62. +0 −10 tests/QuickForm2/Rule/MimeTypeTest.php
  63. +0 −8 tests/QuickForm2/Rule/NonemptyTest.php
  64. +0 −11 tests/QuickForm2/Rule/NotCallbackTest.php
  65. +0 −10 tests/QuickForm2/Rule/NotRegexTest.php
  66. +0 −10 tests/QuickForm2/Rule/RegexTest.php
  67. +0 −10 tests/QuickForm2/Rule/RequiredTest.php
  68. +0 −12 tests/QuickForm2/RuleTest.php
  69. +0 −6 tests/QuickForm2Test.php
  70. +2 −0 tests/TestHelper.php
@@ -290,11 +290,10 @@ public function addElement(
/**
* Removes the element from this container
*
- * If the reference object is not given, the element will be appended.
- *
* @param HTML_QuickForm2_Node $element Element to remove
*
* @return HTML_QuickForm2_Node Removed object
+ * @throws HTML_QuickForm2_NotFoundException
*/
public function removeChild(HTML_QuickForm2_Node $element)
{
@@ -510,9 +509,11 @@ public function render(HTML_QuickForm2_Renderer $renderer)
public function __toString()
{
- require_once 'HTML/QuickForm2/Renderer.php';
+ HTML_QuickForm2_Loader::loadClass('HTML_QuickForm2_Renderer');
- return $this->render(HTML_QuickForm2_Renderer::factory('default'))->__toString();
+ $renderer = $this->render(HTML_QuickForm2_Renderer::factory('default'));
+ return $renderer->__toString()
+ . $renderer->getJavascriptBuilder()->getSetupCode(null, true);
}
/**
@@ -349,12 +349,14 @@ public function render(HTML_QuickForm2_Renderer $renderer)
public function __toString()
{
- require_once 'HTML/QuickForm2/Renderer.php';
+ HTML_QuickForm2_Loader::loadClass('HTML_QuickForm2_Renderer');
- return $this->render(
+ $renderer = $this->render(
HTML_QuickForm2_Renderer::factory('default')
->setTemplateForId($this->getId(), '{content}')
- )->__toString();
+ );
+ return $renderer->__toString()
+ . $renderer->getJavascriptBuilder()->getSetupCode(null, true);
}
}
?>
Oops, something went wrong.

0 comments on commit b255061

Please sign in to comment.