Commit graph

83 commits

Author SHA1 Message Date
gwoo
38221e7aa2 Merge branch '1.2' into 1.3 2009-08-01 23:47:28 -07:00
AD7six
b2142df2bc adding a newline before all comment blocks 2009-07-24 21:18:37 +02:00
mark_story
baea319122 Applying patch from 'Dremora' fixes JavascriptHelper::codeBlock() and blockEnd() bugs where content vanished due to incorrectly structured buffers. Minor behavior change in that codeBlock(null) no longer returns an opening script tag. The entire script tag is returned when blockEnd() is called.
Test cases updated and refactored.
Fixes #6504


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8231 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-07-14 17:11:46 +00:00
mark_story
1ea5f94c29 Updating JavascriptHelper::escapeString to properly encode utf8 characters as per the JSON spec.
Test cases added, with comparisons to json_encode()
Fixes #6400

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8198 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-06-17 01:59:41 +00:00
mark_story
d74e2d1a73 Fixing newline escaping for single quote strings, output now matches json_encode().
Test added, and old test fixed.
Fixing buffering issues, causing test suite menu to disappear when running JavascriptHelper Test case.
Fixes #6167

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8134 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-04-04 02:42:46 +00:00
nate
36d3540c19 Adding native-type-generation fixes for JavascriptHelper::object()
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8095 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-13 14:49:00 +00:00
mark_story
bf4fa09b8f Removing whitespace introduced in [8014]
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8093 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-03-12 17:33:47 +00:00
mark_story
42ef8bfbcf Updating doc strings in Javascript helper for better api generation.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8047 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-18 18:26:22 +00:00
mark_story
e7c71b4125 Updating doc blocks in helpers. Helps generate cleaner API.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@8014 3807eeeb-6ff5-0310-8944-8be069107fe0
2009-02-03 18:48:28 +00:00
nate
e2c087f34b Fixing failing tests in JavascriptHelper.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7944 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-19 01:30:02 +00:00
john
a1046de895 Couple of syntax fixes - missing semicolon and usage of empty() inside a conditional.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7933 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-17 18:09:32 +00:00
nate
870c4e87ca Fixing code formatting in JavascriptHelper to wrap at 100 characters, small return-home-early refactoring.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7931 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-12-17 16:08:31 +00:00
mariano.iglesias
e9953e3f93 Fixing issue where JavascriptHelper::link was generating wrong URLs when webroot is defined and appending timestapping. Fixing issue in previous commit. Fixes #5723, fixes #5045
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7851 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 12:45:00 +00:00
renan.saddam
6319f8ea69 Removed trailing whitespaces from core.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7847 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-11-08 02:54:07 +00:00
AD7six
3f2fa6929b changing tabs for spaces in comment block indentation
Removing address and replacing with cakefoundation url


git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7805 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 17:30:26 +00:00
nate
40bf675589 Refactoring DboSource to remove use of str_split, adding $read (false to calls to) DboSource::value() inside DboSource::create(), cleaning up code formatting, fixes #5598, fixes #5682
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7802 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-10-30 05:03:01 +00:00
mark_story
8b28eec1ab Removed almost all am() calls from core.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7389 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-31 00:16:16 +00:00
TommyO
b6e9888753 Replaced all instances of ife() in /cake
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7387 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-30 20:34:01 +00:00
joelmoss
aa1b0c776e JavascriptHelper::blockEnd now correctly respects safe option. Test also added. Fixes #5074
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7330 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-09 12:08:51 +00:00
gwoo
c3aa47f08e updating Securiity::hash(), closes #5060, closes #5044.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7326 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-07 17:13:09 +00:00
mark_story
e20944a976 Added patch from 'biesbjerg' corrects timestamps not being applied to Vendors css and js. Closes #5045
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7325 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-07-07 01:19:41 +00:00
nate
f7a4858503 Correcting coding standards violations
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7220 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-06-20 11:57:56 +00:00
nate
42da5aba81 Moving Cake folder to correct location
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7063 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 11:40:08 +00:00
DarkAngelBGE
e6e0d852a2 deleting cake folder from svn
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7061 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-30 10:59:16 +00:00
DarkAngelBGE
a625537c4e optimization, refs #3877, fixes #3415
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6969 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-19 20:31:42 +00:00
nate
b7a5a28fbb Improving code coverage for PHP-native JSON generation in JavascriptHelper, fixing object output bug
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6814 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-12 06:04:56 +00:00
mariano.iglesias
219dca11a0 Fixing issue where 'safe' option was not being considered when calling JavascriptHelper::codeBlock and then blockEnd. Increasing test code coverage for JavascriptHelper.
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6806 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-05-11 19:14:35 +00:00
nate
7e68ab152c Correcting timestamp issues in JavascriptHelper::link(), fixes #4441
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6650 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-04-09 19:08:04 +00:00
nate
6fe1e62555 Implementing JavascriptHelper::$inBlock, docblocking JavascriptHelper properties, adding fix for AjaxHelper::sortable() 'overlap' option, fixes #4292
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6561 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-03-12 03:57:54 +00:00
nate
0073683a54 Added Configure option Asset.timestamp = 'force', to force asset timestamps in production mode, fixes #921
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6461 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-02-14 17:35:13 +00:00
nate
e1e9a6fe28 Updating docblock for JavascriptHelper::link(), fixes #4079
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6443 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-02-06 17:34:55 +00:00
nate
1e4549679a Refactored JavascriptHelper::object(), improved JSON spec compliance, added sport for native json extension, improved tests
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6379 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-15 05:21:07 +00:00
nate
93f034b9bd Fixing JavascriptHelper::link() for script files outside of webroot/js (i.e. plugins), fixes #3799
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6313 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-02 19:32:46 +00:00
phpnut
cb53dc61b0 "Closes #2897, Built-in file validation.
Implemented Validation::extension(); and Vaidation::range();
Updated copyright notices in all files"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6296 3807eeeb-6ff5-0310-8944-8be069107fe0
2008-01-01 22:18:17 +00:00
nate
368b085c94 Adding asset filters for CSS and JS, set using 'Asset.filter.css' and 'Asset.filter.js', fixes #2233
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6287 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-31 05:19:00 +00:00
nate
18110fe97a Adding asset timestamps for JS, CSS, and images. Set 'Asset.timestamp' to true in Configure (only in dev mode), fixes #921
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6286 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-31 04:24:14 +00:00
mariano.iglesias
d5a8cd3c22 Changing valid XHTML comment of script blocks and adjusting tests, fixes #3746
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6166 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-17 17:02:54 +00:00
phpnut
8a2b51c3ec "Removing all shortcut function usage from the core"
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6128 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-08 06:08:03 +00:00
mariano.iglesias
5adbf2d75b By default codeBlock generates XHTML strict valid blocks.
All options to JavascriptHelper functions are now set via array. Functions that use codeBlock (such as event) also allow options for codeBlock to be sent in $options array.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6127 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-12-07 21:24:05 +00:00
mariano.iglesias
896f62544b Changing @return int to @return integer and @param bool to @param boolean
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5860 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:54:36 +00:00
phpnut
da97a5c871 Correcting @return bool
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5857 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 16:09:35 +00:00
mariano.iglesias
897825d596 Adding documentation to classes belonging to Cake console.
Standarizing on datatypes used in phpdocblocs and removing unneeded @return types

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5851 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-10-22 05:52:20 +00:00
nate
8f4dd39257 Fixing return value for JavascriptHelper::blockEnd() for script caching (Ticket #3172)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5686 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-09-23 14:23:39 +00:00
phpnut
dac1bd0913 Correcting code structure to standards
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5315 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-20 07:51:52 +00:00
phpnut
23dfd90b29 Correcting code structure to standards
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5313 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-06-20 06:15:35 +00:00
phpnut
82755f6685 Adding fix for #2552, fixes JavascriptHelper::object does not convert boolean values correctly
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5046 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-12 08:38:12 +00:00
phpnut
4bac0a063b Removing deprecated code and files
/basics.php
 * normalizeList() Deprecated: see Set::normalize
 * countdim() see Set::countDim

libs/controller/components/request_handler.php
 * RequestHandler::disableStartup = false; see RequestHandler::$enabled
 * RequestHandlerComponent::setView() see RequestHandlerComponent::renderAs()
 * RequestHandlerComponent::setAjax() see RequestHandlerComponent::renderAs()

libs/controller/components/session.php
 * SessionComponent::flash() use $session->flash('key'); in your views

libs/controller/controller.php
 * Controller::_setTitle() see Controller::set()

libs/model/datasources/dbo_source.php
 * DboSource::fetchArray() see DboSource::fetchRow()
 * DboSource::one() see DboSource::fetchRow()

libs/model/db_acl.php
 * DB_ACL::getAco()  see AclComponent::$Aco::node()
 * DB_ACL::getAro() see AclComponent::$Aro::node()

libs/neat_array.php
 * Class is not longer available use libs/set.php Set class

libs/sanitize.php
 * Sanitize::sql() see Sanitize::escape()
 * Sanitize::cleanArray() see Sanitize::clean()
 * Sanitize::cleanArrayR() see Sanitize::clean()
 * Sanitize::cleanValue() see Sanitize::clean()

libs/view/helper.php
 * Helper::parseHtmlOptions() see HtmlHelper::_parseAttributes()

libs/view/helpers/form.php
 * define('TAG_DIV', '<div class="%s">%s</div>');
 * define('TAG_P_CLASS', '<p class="%s">%s</p>');
 * define('TAG_LABEL', '<label for="%s">%s</label>');
 * define('TAG_FIELDSET', '<fieldset><legend>%s</legend>%s</label>');
 * FormHelper::labelTag() see FormHelper::label()
 * FormHelper::divTag() see HtmlHelper::div()
 * FormHelper::pTag() see HtmlHelper::para
 * FormHelper::generateInputDiv() see FormHelper::input()
 * FormHelper::generateCheckboxDiv() see FormHelper::input()
 * FormHelper::generateDate() see FormHelper::input()
 * FormHelper::generateTime() see FormHelper::input()
 * FormHelper::generateDateTime() see FormHelper::input()
 * FormHelper::generateAreaDiv() see FormHelper::input()
 * FormHelper::generateSelectDiv() see FormHelper::input()
 * FormHelper::generateSubmitDiv() see FormHelper::input()
 * FormHelper::generateFields() see FormHelper::input()

libs/view/helpers/html.php
 * HtmlHelper::file() see FormHelper::file()
 * HtmlHelper::submit() see FormHelper::submit()
 * HtmlHelper::selectTag() see FormHelper::select()
 * HtmlHelper::formTag() see FormHelper::create()
 * HtmlHelper::linkEmail() see HtmlHelper::link()
 * HtmlHelper::dayOptionTag() see FormHelper::day()
 * HtmlHelper::yearOptionTag() see FormHelper::year()
 * HtmlHelper::monthOptionTag() see FormHelper::month()
 * HtmlHelper::hourOptionTag() see FormHelper::hour()
 * HtmlHelper::minuteOptionTag() see FormHelper::minute()
 * HtmlHelper::meridianOptionTag() see FormHelper::meridian()
 * HtmlHelper::dateTimeOptionTag() see FormHelper::dateTime()

libs/view/helpers/javascript.php
 * JavascriptHelper::linkOut() see JavascriptHelper::link()

libs/view/view.php
 * View::setLayout() use $this->layout in your view

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4981 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-05-02 08:07:19 +00:00
nate
8df2d428ff Fixing JavascriptHelper::object() bug with numeric indexes, as reported on the mailing list
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4838 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-04-11 18:02:10 +00:00
nate
8e92df3bbb Adding JavascriptHelper::object() fix for 0 being converted to null (Ticket #2296)
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4680 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-26 17:22:02 +00:00
dho
8917efcc0a Appending .js to strings like script-x.x.x in link() function
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4615 3807eeeb-6ff5-0310-8944-8be069107fe0
2007-03-15 16:37:46 +00:00