Updating PrototypeEngineHelper::request() to use dataExpression. Allo…

…wing Js::submit() to work with prototype.
cakephp · Jul 25, 2009 · d4d9db4 · d4d9db4
1 parent dda6c93
commit d4d9db4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/cake/libs/view/helpers/prototype_engine.php b/cake/libs/view/helpers/prototype_engine.php
@@ -193,6 +193,10 @@ function request($url, $options = array()) {
 			unset($options['update'], $options['type']);
 		}
 		$callbacks = array('onCreate', 'onComplete', 'onFailure', 'onRequest', 'onSuccess');
+		if (isset($options['dataExpression'])) {
+			$callbacks[] = 'parameters';
+			unset($options['dataExpression']);
+		}
 		$options = $this->_parseOptions($options, $callbacks);
 		if (!empty($options)) {
 			$options = ', {' . $options . '}';

diff --git a/cake/tests/cases/libs/view/helpers/prototype_engine.test.php b/cake/tests/cases/libs/view/helpers/prototype_engine.test.php
@@ -205,6 +205,17 @@ function testRequest() {
 		));
 		$expected = 'var jsRequest = new Ajax.Request("/people/edit/1", {method:"post", onComplete:doSuccess, onFailure:handleError, parameters:{"name":"jim","height":"185cm"}});';
 		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->request('/people/edit/1', array(
+			'method' => 'post',
+			'complete' => 'doSuccess',
+			'error' => 'handleError',
+			'type' => 'json',
+			'data' => '$("element").serialize()',
+			'dataExpression' => true
+		));
+		$expected = 'var jsRequest = new Ajax.Request("/people/edit/1", {method:"post", onComplete:doSuccess, onFailure:handleError, parameters:$("element").serialize()});';
+		$this->assertEqual($result, $expected);
 	}
 /**
  * test sortable list generation