From 1f560ccd8a9e21871dbedd548fc97f231131c771 Mon Sep 17 00:00:00 2001 From: xue <> Date: Wed, 30 Aug 2006 12:33:43 +0000 Subject: merge from 3.0 branch till 1363. --- framework/3rdParty/readme.html | 29 +- framework/PradoBase.php | 36 +- framework/TComponent.php | 26 + framework/Util/TDateTimeStamp.php | 700 ++++ framework/Util/TSimpleDateFormatter.php | 14 +- framework/Web/Javascripts/js/ajax.js | 285 -- framework/Web/Javascripts/js/clientscripts.php | 61 - framework/Web/Javascripts/js/colorpicker.js | 93 - framework/Web/Javascripts/js/compressed/ajax.js | 299 ++ .../Javascripts/js/compressed/clientscripts.php | 61 + .../Web/Javascripts/js/compressed/colorpicker.js | 93 + .../Web/Javascripts/js/compressed/datepicker.js | 117 + framework/Web/Javascripts/js/compressed/effects.js | 66 + framework/Web/Javascripts/js/compressed/logger.js | 188 ++ framework/Web/Javascripts/js/compressed/prado.js | 339 ++ framework/Web/Javascripts/js/compressed/rico.js | 265 ++ .../Web/Javascripts/js/compressed/validator.js | 205 ++ framework/Web/Javascripts/js/datepicker.js | 117 - framework/Web/Javascripts/js/debug/ajax.js | 3303 ++++++++++++++++++ .../Web/Javascripts/js/debug/clientscripts.php | 61 + framework/Web/Javascripts/js/debug/colorpicker.js | 778 +++++ framework/Web/Javascripts/js/debug/datepicker.js | 695 ++++ framework/Web/Javascripts/js/debug/effects.js | 960 ++++++ framework/Web/Javascripts/js/debug/logger.js | 731 ++++ framework/Web/Javascripts/js/debug/prado.js | 3086 +++++++++++++++++ framework/Web/Javascripts/js/debug/rico.js | 3503 ++++++++++++++++++++ framework/Web/Javascripts/js/debug/validator.js | 1279 +++++++ framework/Web/Javascripts/js/effects.js | 66 - framework/Web/Javascripts/js/logger.js | 188 -- framework/Web/Javascripts/js/prado.js | 406 --- framework/Web/Javascripts/js/rico.js | 265 -- framework/Web/Javascripts/js/validator.js | 207 -- framework/Web/Javascripts/prado/validation3.js | 12 +- framework/Web/TAssetManager.php | 3 + framework/Web/UI/TClientScriptManager.php | 15 +- framework/Web/UI/TControl.php | 28 +- framework/Web/UI/TTemplateManager.php | 14 +- .../Web/UI/WebControls/TDataTypeValidator.php | 2 +- framework/Web/UI/WebControls/TDatePicker.php | 14 +- framework/Web/UI/WebControls/THead.php | 19 + 40 files changed, 16875 insertions(+), 1754 deletions(-) create mode 100644 framework/Util/TDateTimeStamp.php delete mode 100644 framework/Web/Javascripts/js/ajax.js delete mode 100644 framework/Web/Javascripts/js/clientscripts.php delete mode 100644 framework/Web/Javascripts/js/colorpicker.js create mode 100644 framework/Web/Javascripts/js/compressed/ajax.js create mode 100644 framework/Web/Javascripts/js/compressed/clientscripts.php create mode 100644 framework/Web/Javascripts/js/compressed/colorpicker.js create mode 100644 framework/Web/Javascripts/js/compressed/datepicker.js create mode 100644 framework/Web/Javascripts/js/compressed/effects.js create mode 100644 framework/Web/Javascripts/js/compressed/logger.js create mode 100644 framework/Web/Javascripts/js/compressed/prado.js create mode 100644 framework/Web/Javascripts/js/compressed/rico.js create mode 100644 framework/Web/Javascripts/js/compressed/validator.js delete mode 100644 framework/Web/Javascripts/js/datepicker.js create mode 100644 framework/Web/Javascripts/js/debug/ajax.js create mode 100644 framework/Web/Javascripts/js/debug/clientscripts.php create mode 100644 framework/Web/Javascripts/js/debug/colorpicker.js create mode 100644 framework/Web/Javascripts/js/debug/datepicker.js create mode 100644 framework/Web/Javascripts/js/debug/effects.js create mode 100644 framework/Web/Javascripts/js/debug/logger.js create mode 100644 framework/Web/Javascripts/js/debug/prado.js create mode 100644 framework/Web/Javascripts/js/debug/rico.js create mode 100644 framework/Web/Javascripts/js/debug/validator.js delete mode 100644 framework/Web/Javascripts/js/effects.js delete mode 100644 framework/Web/Javascripts/js/logger.js delete mode 100644 framework/Web/Javascripts/js/prado.js delete mode 100644 framework/Web/Javascripts/js/rico.js delete mode 100644 framework/Web/Javascripts/js/validator.js (limited to 'framework') diff --git a/framework/3rdParty/readme.html b/framework/3rdParty/readme.html index 590f1174..1810e5e7 100644 --- a/framework/3rdParty/readme.html +++ b/framework/3rdParty/readme.html @@ -61,21 +61,21 @@ projects.