From 5ba6cd4be568f686d890835a77586077cde1a943 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 25 Apr 2006 01:31:43 +0000
Subject: Merge from 3.0 branch till 967.
---
.gitattributes | 8 +-
.gitignore | 19 +
HISTORY | 2 +-
build.xml | 28 +-
.../jsbuilder/JavaScript Documentation Tool.html | 496 +
buildscripts/jsbuilder/build.php | 25 +-
buildscripts/texbuilder/prado3_quick_start.pdf | 10502 -------------------
framework/Exceptions/messages.txt | 2 +
framework/Util/TSimpleDateFormatter.php | 8 +-
framework/Web/Javascripts/TJavaScript.php | 13 +-
.../Web/Javascripts/colorpicker/colorpicker.js | 59 +-
framework/Web/Javascripts/datepicker/datepicker.js | 96 +-
framework/Web/Javascripts/extended/event.js | 5 +-
framework/Web/Javascripts/js/colorpicker.js | 36 +-
framework/Web/Javascripts/js/datepicker.js | 86 +-
framework/Web/Javascripts/js/prado.js | 5 +-
framework/Web/Javascripts/js/validator.js | 237 +-
framework/Web/Javascripts/prado/form.js | 2 +-
framework/Web/Javascripts/prado/validation3.js | 396 +-
framework/Web/THttpResponse.php | 17 +-
framework/Web/UI/WebControls/TBaseValidator.php | 6 +-
framework/Web/UI/WebControls/TCheckBox.php | 4 +-
framework/Web/UI/WebControls/TCheckBoxList.php | 12 +-
framework/Web/UI/WebControls/TCompareValidator.php | 16 +-
.../Web/UI/WebControls/TDataTypeValidator.php | 8 +-
framework/Web/UI/WebControls/TDatePicker.php | 45 +-
framework/Web/UI/WebControls/THtmlArea.php | 2 +-
.../Web/UI/WebControls/TListControlValidator.php | 214 +
framework/Web/UI/WebControls/TRangeValidator.php | 41 +-
.../Web/UI/WebControls/TRequiredFieldValidator.php | 30 +-
.../features/protected/pages/DatePicker.page | 18 +-
.../tickets/protected/pages/Ticket54Master.tpl | 2 +-
.../protected/pages/DataTypeValidator.page | 33 +
.../validators/protected/pages/DatePicker.page | 64 +
.../validators/protected/pages/Layout.tpl | 5 +
.../validators/protected/pages/ListControl.page | 58 +
.../protected/pages/RequiredListValidator.page | 13 +-
.../validators/tests/DatePickerTestCase.php | 63 +
.../validators/tests/ListControlTestCase.php | 48 +
.../validators/tests/RequiredListTestCase.php | 53 +-
tests/unit/phpunit2.php | 8 +
41 files changed, 1942 insertions(+), 10843 deletions(-)
create mode 100644 .gitignore
create mode 100644 buildscripts/jsbuilder/JavaScript Documentation Tool.html
delete mode 100644 buildscripts/texbuilder/prado3_quick_start.pdf
create mode 100644 framework/Web/UI/WebControls/TListControlValidator.php
create mode 100644 tests/FunctionalTests/validators/protected/pages/DataTypeValidator.page
create mode 100644 tests/FunctionalTests/validators/protected/pages/DatePicker.page
create mode 100644 tests/FunctionalTests/validators/protected/pages/ListControl.page
create mode 100644 tests/FunctionalTests/validators/tests/DatePickerTestCase.php
create mode 100644 tests/FunctionalTests/validators/tests/ListControlTestCase.php
diff --git a/.gitattributes b/.gitattributes
index 09a257fd..1f88e993 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,6 +4,7 @@
/UPGRADE -text
/build.xml -text
buildscripts/.htaccess -text
+buildscripts/jsbuilder/JavaScript[!!-~]Documentation[!!-~]Tool.html -text
buildscripts/jsbuilder/build.php -text
buildscripts/phing/style/coverage-frames.xsl -text
buildscripts/phing/style/log.xsl -text
@@ -16,7 +17,6 @@ buildscripts/phing/tasks/ZendCodeAnalyzerTask.php -text
buildscripts/phpbuilder/build.php -text
buildscripts/setup.php -text
buildscripts/texbuilder/build.php -text
-buildscripts/texbuilder/prado3_quick_start.pdf -text
buildscripts/texbuilder/prado3_quick_start.tex -text
demos/composer/index.php -text
demos/composer/index2.php -text
@@ -977,6 +977,7 @@ framework/Web/UI/WebControls/TLabel.php -text
framework/Web/UI/WebControls/TLinkButton.php -text
framework/Web/UI/WebControls/TListBox.php -text
framework/Web/UI/WebControls/TListControl.php -text
+framework/Web/UI/WebControls/TListControlValidator.php -text
framework/Web/UI/WebControls/TLiteral.php -text
framework/Web/UI/WebControls/TMultiView.php -text
framework/Web/UI/WebControls/TOutputCache.php -text
@@ -1160,12 +1161,15 @@ tests/FunctionalTests/validators/protected/pages/CheckBox.php -text
tests/FunctionalTests/validators/protected/pages/CompareValidator.page -text
tests/FunctionalTests/validators/protected/pages/CustomValidator.page -text
tests/FunctionalTests/validators/protected/pages/CustomValidator.php -text
+tests/FunctionalTests/validators/protected/pages/DataTypeValidator.page -text
+tests/FunctionalTests/validators/protected/pages/DatePicker.page -text
tests/FunctionalTests/validators/protected/pages/ImageButton.page -text
tests/FunctionalTests/validators/protected/pages/ImageButton.php -text
tests/FunctionalTests/validators/protected/pages/Layout.php -text
tests/FunctionalTests/validators/protected/pages/Layout.tpl -text
tests/FunctionalTests/validators/protected/pages/LinkButton.page -text
tests/FunctionalTests/validators/protected/pages/LinkButton.php -text
+tests/FunctionalTests/validators/protected/pages/ListControl.page -text
tests/FunctionalTests/validators/protected/pages/RangeValidatorDate.page -text
tests/FunctionalTests/validators/protected/pages/RangeValidatorFloat.page -text
tests/FunctionalTests/validators/protected/pages/RangeValidatorInteger.page -text
@@ -1179,8 +1183,10 @@ tests/FunctionalTests/validators/tests/ButtonTestCase.php -text
tests/FunctionalTests/validators/tests/CheckBoxTestCase.php -text
tests/FunctionalTests/validators/tests/CompareValidatorTestCase.php -text
tests/FunctionalTests/validators/tests/CustomValidatorTestCase.php -text
+tests/FunctionalTests/validators/tests/DatePickerTestCase.php -text
tests/FunctionalTests/validators/tests/ImageButtonTestCase.php -text
tests/FunctionalTests/validators/tests/LinkButtonTestCase.php -text
+tests/FunctionalTests/validators/tests/ListControlTestCase.php -text
tests/FunctionalTests/validators/tests/RangeValidatorTestCase.php -text
tests/FunctionalTests/validators/tests/RegExpValidatorTestCase.php -text
tests/FunctionalTests/validators/tests/RequiredFieldTestCase.php -text
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..9e781339
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,19 @@
+/.project
+buildscripts/jsbuilder/JSDoc
+demos/quickstart/assets/274d44dc
+demos/quickstart/assets/56624407
+demos/quickstart/assets/587c9c16
+demos/quickstart/assets/6faffc33
+demos/quickstart/assets/93f32b8c
+demos/quickstart/assets/ba811377
+demos/quickstart/assets/d8c27ba3
+demos/quickstart/assets/dd11c427
+demos/quickstart/assets/ee054f3e
+demos/quickstart/protected/runtime/application.xml
+tests/FunctionalTests/results.dat
+tests/FunctionalTests/tickets/assets/93f32b8c
+tests/FunctionalTests/tickets/assets/961aa02b
+tests/FunctionalTests/tickets/protected/runtime/global.cache
+tests/FunctionalTests/validators/assets/905759a2
+tests/FunctionalTests/validators/assets/93f32b8c
+tests/FunctionalTests/validators/protected/runtime/global.cache
diff --git a/HISTORY b/HISTORY
index ef864e76..bf75c31a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -19,7 +19,7 @@ BUG: Non-control components can now use expressions in their properties (Qiang)
BUG: TControl.Visible did not make use of overriden getVisible() (Qiang)
BUG: TWizard did not stop navigation upon a validation failure (Qiang)
ENH: TButton, TImageButton and TLinkButton now implement IButtonControl interface (Qiang)
-ENH: TResponse::writeFile takes two additional parameters to allow sending memory data (Qiang)
+ENH: TResponse::writeFile takes three additional parameters to allow sending memory data (Qiang)
ENH: TButtonColumn can now be a column of image buttons (Qiang)
CHG: Rewrote client-side javascript validators, check your client-side validation behaviour (Wei)
CHG: Updated the javascript Prototype library, a few utilties functions REMOVED, may break your existing javascript code. (Wei)
diff --git a/build.xml b/build.xml
index 0515d55c..251a4b0d 100644
--- a/build.xml
+++ b/build.xml
@@ -12,9 +12,10 @@
@constructor
and @private
are two of the most important ones. As noted above, JavaScript has the capability to be a much more dynamic language than Java. The JSDoc parser can usually find class constructors on it's own, but there are some situations when it needs some additional assistance. For this reason, it is a good practice to always include the @constructor
tag in the documentation for a class constructor, as shown below:
+
+
+ /**
+ * Nothing is a class that represents nothing
+ * @constructor
+ */
+ function Nothing(){
+ // ... initialization ...
+ }
+
+
+ The @private
attribute simply displays the marked method as being private.
+
+ To get more information on the use of the jsdoc.pl executable itself, run it with the --help
commandline option.
+
Tag Reference |
+ ||||||||||||||||||||||||||||||||||||||||||||||||
+ The following is a summary of the supported tags ('@'-attributes) that are supported by JSDoc. For actual examples of the usage of these tags, please see the test.js JavaScript file that is included in the JSDoc distribution.
+
|
+
Frequently Asked Questions |
+
+
|
+
More Information |
+
+ + A very complete and informative article (written by Rainer Eschen) on the use of JSDoc can be found at Webetiser. The article is based on JSDoc 1.5, but is still very relevant. I've been told that the article will be updated in the near future. + + + As noted above, the definitive reference for writing Java docstrings can be found at the javadoc reference page. Please send comments, bugs, complaints, requests for additional information, and whatever else to the JSDoc mailing list. + + + |
+