Applying fixes made to JavascriptHelper to JsBaseEngine.

cakephp · Feb 18, 2010 · 96bbbb2 · 96bbbb2
1 parent 2209f19
commit 96bbbb2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php
@@ -590,7 +590,7 @@ function object($data = array(), $options = array()) {
 
 			foreach ($data as $key => $val) {
 				if (is_array($val) || is_object($val)) {
-					$val = $this->object($val, $options);
+					$val = $this->object($val);
 				} else {
 					$val = $this->value($val);
 				}

diff --git a/cake/tests/cases/libs/view/helpers/js.test.php b/cake/tests/cases/libs/view/helpers/js.test.php
@@ -502,7 +502,7 @@ function testSetVarsAtTopOfBufferedScripts() {
 		$this->Js->alert('hey you!', array('buffer' => true));
 		$this->Js->confirm('Are you sure?', array('buffer' => true));
 		$result = $this->Js->getBuffer(false);
-		
+
 		$expected = 'window.app = {"height":"tall","color":"purple"};';
 		$this->assertEqual($result[0], $expected);
 		$this->assertEqual($result[1], 'alert("hey you!");');
@@ -665,6 +665,13 @@ function testObject() {
 			$result = $this->JsEngine->object($data);
 			$this->assertEqual($result, $expected);
 		}
+
+		$object = array('title' => 'New thing', 'indexes' => array(5, 6, 7, 8), 'object' => array('inner' => array('value' => 1)));
+		$result = $this->JsEngine->object($object, array('prefix' => 'PREFIX', 'postfix' => 'POSTFIX'));
+		$this->assertPattern('/^PREFIX/', $result);
+		$this->assertPattern('/POSTFIX$/', $result);
+		$this->assertNoPattern('/.PREFIX./', $result);
+		$this->assertNoPattern('/.POSTFIX./', $result);
 	}
 
 /**