Permalink
Browse files

Applying patch from 'evilbloodydemon'. Fixes JqueryEngine::request() …

…when wrapCallbacks is true. Test cases added. Fixes #20
  • Loading branch information...
1 parent 4b88ba5 commit 459fcb7a1a0b229efe627c7772aa7c0b96d0c4b7 @markstory markstory committed Aug 12, 2009
@@ -240,7 +240,13 @@ function request($url, $options = array()) {
}
$options['url'] = $url;
if (isset($options['update'])) {
- $options['success'] = 'function (msg, status) {$("' . $options['update'] . '").html(msg);}';
+ $wrapCallbacks = isset($options['wrapCallbacks']) ? $options['wrapCallbacks'] : true;
+ if ($wrapCallbacks) {
+ $success = '$("' . $options['update'] . '").html(data);';
+ } else {
+ $success = 'function (data, textStatus) {$("' . $options['update'] . '").html(data);}';
+ }
+ $options['success'] = $success;
unset($options['update']);
}
$callbacks = array('success', 'error', 'beforeSend', 'complete');
@@ -160,6 +160,12 @@ function testRequest() {
$expected = '$.ajax({url:"\\/posts\\/view\\/1"});';
$this->assertEqual($result, $expected);
+ $result = $this->Jquery->request(array('controller' => 'posts', 'action' => 'view', 1), array(
+ 'update' => '#content'
+ ));
+ $expected = '$.ajax({success:function (data, textStatus) {$("#content").html(data);}, url:"\/posts\/view\/1"});';
+ $this->assertEqual($result, $expected);
+
$result = $this->Jquery->request('/people/edit/1', array(
'method' => 'post',
'before' => 'doBefore',
@@ -179,7 +185,7 @@ function testRequest() {
'method' => 'post',
'wrapCallbacks' => false
));
- $expected = '$.ajax({success:function (msg, status) {$("#updated").html(msg);}, type:"post", url:"\\/people\\/edit\\/1"});';
+ $expected = '$.ajax({success:function (data, textStatus) {$("#updated").html(data);}, type:"post", url:"\\/people\\/edit\\/1"});';
$this->assertEqual($result, $expected);
$result = $this->Jquery->request('/people/edit/1', array(
@@ -190,7 +196,7 @@ function testRequest() {
'data' => '$("#someId").serialize()',
'wrapCallbacks' => false
));
- $expected = '$.ajax({data:$("#someId").serialize(), success:function (msg, status) {$("#updated").html(msg);}, type:"post", url:"\\/people\\/edit\\/1"});';
+ $expected = '$.ajax({data:$("#someId").serialize(), success:function (data, textStatus) {$("#updated").html(data);}, type:"post", url:"\\/people\\/edit\\/1"});';
$this->assertEqual($result, $expected);
$result = $this->Jquery->request('/people/edit/1', array(

0 comments on commit 459fcb7

Please sign in to comment.