Making JsHelper::set() work well with setting the variables to an obj…

…ect property.
cakephp · Oct 17, 2009 · f07df02 · f07df02
1 parent 4be98b6
commit f07df02
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php
@@ -237,7 +237,8 @@ function getBuffer($clear = true) {
  **/
 	function _createVars() {
 		if (!empty($this->__jsVars)) {
-			$this->buffer('var ' . $this->setVariable . ' = ' . $this->object($this->__jsVars) . ';');
+			$setVar = (strpos($this->setVariable, '.')) ? $this->setVariable : 'var ' . $this->setVariable;
+			$this->buffer($setVar . ' = ' . $this->object($this->__jsVars) . ';');
 		}
 	}
 

diff --git a/cake/tests/cases/libs/view/helpers/js.test.php b/cake/tests/cases/libs/view/helpers/js.test.php
@@ -442,13 +442,20 @@ function testSet() {
 		$result = $this->Js->getBuffer();
 		$expected = 'var app = {"loggedIn":true,"height":"tall","color":"purple"};';
 		$this->assertEqual($result[0], $expected);
-		
+
 		$this->Js->set('loggedIn', true);
 		$this->Js->set(array('height' => 'tall', 'color' => 'purple'));
 		$this->Js->setVariable = 'WICKED';
-		$result = $this->Js->getBuffer(false);
+		$result = $this->Js->getBuffer();
 		$expected = 'var WICKED = {"loggedIn":true,"height":"tall","color":"purple"};';
 		$this->assertEqual($result[0], $expected);
+
+		$this->Js->set('loggedIn', true);
+		$this->Js->set(array('height' => 'tall', 'color' => 'purple'));
+		$this->Js->setVariable = 'Application.variables';
+		$result = $this->Js->getBuffer();
+		$expected = 'Application.variables = {"loggedIn":true,"height":"tall","color":"purple"};';
+		$this->assertEqual($result[0], $expected);
 	}
 }