Commit graph

53 commits

Author SHA1 Message Date
Mark Story
08e7bcb7ab Merge branch '1.3' into integration
Conflicts:
	app/config/core.php
	cake/console/libs/acl.php
	cake/console/templates/skel/config/core.php
	cake/console/templates/skel/webroot/test.php
	cake/dispatcher.php
	cake/libs/view/errors/missing_action.ctp
	cake/libs/view/helpers/form.php
	cake/tests/cases/libs/cache/memcache.test.php
	cake/tests/cases/libs/controller/controller.test.php
	cake/tests/cases/libs/log/file_log.test.php
	cake/tests/cases/libs/model/cake_schema.test.php
	cake/tests/cases/libs/router.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/groups/bake.group.php
	cake/tests/groups/behaviors.group.php
	cake/tests/groups/i18n.group.php
	cake/tests/groups/javascript.group.php
	cake/tests/lib/reporter/cake_cli_reporter.php
2010-10-31 21:56:59 -04:00
Graham Weldon
d3e0ddbb0e Update copyright years. 2010-10-25 07:58:22 +11:00
mark_story
f19e3d501c Merge branch '1.3' into integration
Conflicts:
	cake/libs/model/cake_schema.php
	cake/libs/model/datasources/dbo_source.php
	cake/libs/model/model.php
	cake/libs/view/helpers/form.php
	cake/libs/view/view.php
	cake/libs/xml.php
	cake/tests/cases/libs/model/model_delete.test.php
	cake/tests/cases/libs/view/view.test.php
	cake/tests/cases/libs/xml.test.php
2010-10-13 22:30:40 -04:00
mark_story
f847080cbf Changing more php version strings. 2010-10-03 12:46:03 -04:00
mark_story
5c27abd35f Applying patch from 'hashmich' to make jQueryEngine not override the success callback. This allows you to provide a success callback and still get the html insertion when used with the update key.
Tests updated.
Fixes #1158
2010-10-01 22:43:46 -04:00
predominant
6a18b2bc1d Merge remote branch 'origin/1.3' into 2.0
Conflicts:
	cake/basics.php
	cake/console/libs/shell.php
	cake/console/libs/tasks/controller.php
	cake/libs/controller/components/request_handler.php
	cake/libs/model/model.php
	cake/libs/model/model_behavior.php
	cake/libs/overloadable.php
	cake/libs/overloadable_php4.php
	cake/libs/overloadable_php5.php
	cake/libs/sanitize.php
	cake/libs/validation.php
	cake/libs/view/helpers/ajax.php
	cake/libs/view/helpers/javascript.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/console/libs/tasks/controller.test.php
	cake/tests/cases/libs/overloadable.test.php
	cake/tests/cases/libs/validation.test.php
	cake/tests/cases/libs/view/helpers/ajax.test.php
	cake/tests/cases/libs/view/helpers/javascript.test.php
	cake/tests/test_app/libs/cache/test_app_cache.php
	cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
	cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
2010-05-20 12:22:04 +10:00
mark_story
3a60aa07de Fixing issues where setting jQueryObject did not affect request() and its connected methods.
Tests added.
Fixes #728
2010-05-17 18:25:50 -04:00
predominant
8f880731c6 Removing closing PHP tags. 2010-05-11 08:27:28 +10:00
predominant
1ec220dac2 Removing closing PHP tags. 2010-05-11 08:07:49 +10:00
predominant
1497ec3910 Changed all public methods to specify public access. 2010-04-05 13:19:38 +10:00
predominant
850ca02bb6 Changed all public 'var' declarations to be 'public $var' 2010-04-04 17:14:00 +10:00
predominant
329a13fe5f Changed all $_ declared variables to protected. 2010-04-04 16:36:12 +10:00
Mark Story
8216f5010c Fixing @see tags in JsEngines 2010-03-06 10:46:26 -05:00
Mark Story
832b15ba3e Fixing issues in JqueryEngineHelper where eval()'ed responses wouldn't run code contained inside $js->domReady() due to implementation differences between $(document).ready() and $(document).bind('ready'). Tests updated. 2010-01-29 10:06:47 -05:00
Mark Story
a77a064164 Updating doc blocks for the helpers. Unifying formatting and adding missing @access tags and fixing various formatting differences. 2010-01-25 17:59:05 -05:00
Mark Story
be7ce6e923 Fixing issues where chained jQuery engine requests wouldn't eval() script elements, making ajax pagination much harder. 2010-01-06 11:59:15 -05:00
predominant
0977b3fe15 Standardising docblock endings throughout. 2009-11-14 23:19:25 +11:00
predominant
62810fb4f4 Updating more Copyright dates. 2009-11-06 18:04:38 +11:00
predominant
384bb7a0e0 Update license lines throughout. 2009-11-06 17:51:51 +11:00
predominant
8ff6505fe8 Removing excess whitespace 2009-11-06 17:08:23 +11:00
predominant
6782cb019c Update CakePHP Project link. 2009-11-06 17:00:11 +11:00
predominant
8f75ff58c7 Removing @filesource 2009-11-06 15:24:02 +11:00
mark_story
06e59abb1f Removing trailing spaces. 2009-08-12 10:21:28 -04:00
mark_story
459fcb7a1a Applying patch from 'evilbloodydemon'. Fixes JqueryEngine::request() when wrapCallbacks is true. Test cases added. Fixes #20 2009-08-12 09:45:42 -04:00
mark_story
d69772952c Fixing fatal error in php4 2009-08-03 14:42:33 -04:00
mark_story
3a5b782737 Adding newlines and tests for slideDown slideUp alternate syntax for jquery engine. 2009-07-29 22:37:41 -04:00
mark_story
5b13b29a92 Adding callbackArguments and parseCallbacks to jQuery engine. 2009-07-29 22:19:02 -04:00
mark_story
9a66c2cfc5 Fixing method param in jQuery engine. Needed to be converted to 'type'.
Fixing issues in JsHelper::submit() related to data being escaped.
Updating tests cases.
2009-07-24 23:29:44 -04:00
mark_story
36722c0ef2 Implementing serializeForm() in jquery engine. 2009-07-24 22:46:33 -04:00
mark_story
4a4b9eefe5 Updating file headers.
Removing newlines.
2009-07-17 00:09:06 -04:00
mark_story
5bdd5560b7 Merge branch '1.3-jshelper' of git@thechaw.com:cakephp into 1.3-jshelper
Conflicts:
	cake/libs/view/helpers/jquery_engine.php
	cake/libs/view/helpers/js.php
2009-04-26 23:28:05 -04:00
mark_story
9754926d02 Merging with self. 2009-04-24 13:44:52 -04:00
mark_story
91edcacec2 Adding newlines between methods. 2009-04-21 09:31:52 -07:00
mark_story
5bc6bcfce1 Adding slider to base engine and jquery engine. Tests added. 2009-04-18 22:00:58 -04:00
mark_story
4507d2b895 Adding slider() skel to libraries. 2009-04-15 23:59:13 -04:00
mark_story
4b2504d334 Refactor repetitive logic in jquery engine. 2009-04-11 23:47:43 -04:00
mark_story
646cfd7a83 Adding drop() to jquery.
Adding testcases.
Fixing doc blocks.
2009-04-08 23:57:32 -04:00
mark_story
0269994842 Adding Drag() to jquery 2009-04-08 23:31:17 -04:00
mark_story
5f7abae48c Fixing request() callbacks. Starting test for prototype 2009-04-05 23:49:09 -04:00
mark_story
87c5a5da6a Fixing jquery::request() and update key.
Adding drag and drop test skeleton to mootools/jquery
2009-03-29 23:00:39 -04:00
mark_story
e2918c6f5e Updating slide effects for jquery engine. 2009-03-29 00:28:15 -04:00
mark_story
d59a704fb1 Adding sortable to jQuery engine. 2009-03-27 23:44:57 -04:00
mark_story
eea1fa576c Refactoring quote style in jquery engine 2009-03-15 21:44:40 -04:00
mark_story
87d68e5029 Switching quote styles in mootools engine
Adding effect() and each() to mootools
Adding tests
2009-03-15 19:59:16 -04:00
mark_story
a9da171e8c Removing multiple param for JsBaseEngine::get() it is not needed.
Adding get() to Mootools engine
2009-03-15 17:48:27 -04:00
mark_story
e873bb5ab9 Adding querystring creation and option mapping to jquery engine.
More complex ajax requests can now be done.
2009-03-15 13:08:29 -04:00
mark_story
72866966b0 Updating parseOptions to allow safeKeys that do not need to be escaped
Useful for handling function callbacks in options arrays.
2009-03-15 12:26:12 -04:00
mark_story
ffdbec12fe Refactoring event() and adding ability to stop default events. 2009-03-15 12:10:46 -04:00
mark_story
ae2114dcc1 Starting request() for jquery engine.
Adding _mapOptions so engines can map from abstract to concrete option
names.
Tests added.
2009-03-14 17:01:49 -04:00
mark_story
12cc01eff5 Fixing + updating doc blocks 2009-03-14 13:48:31 -04:00