Applying patch from 'kleingeist'. JsHelper::set() now generates a var…

…iable that is assigned to window.$var instead of creating a local variable by default. Tests updated. Fixes #96
cakephp · Dec 14, 2009 · 4f985e4 · 4f985e4
1 parent aaddd0d
commit 4f985e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cake/libs/view/helpers/js.php b/cake/libs/view/helpers/js.php
@@ -248,7 +248,7 @@ function getBuffer($clear = true) {
  */
 	function _createVars() {
 		if (!empty($this->__jsVars)) {
-			$setVar = (strpos($this->setVariable, '.')) ? $this->setVariable : 'var ' . $this->setVariable;
+			$setVar = (strpos($this->setVariable, '.')) ? $this->setVariable : 'window.' . $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
@@ -451,14 +451,14 @@ function testSet() {
 		$this->Js->set('loggedIn', true);
 		$this->Js->set(array('height' => 'tall', 'color' => 'purple'));
 		$result = $this->Js->getBuffer();
-		$expected = 'var app = {"loggedIn":true,"height":"tall","color":"purple"};';
+		$expected = 'window.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();
-		$expected = 'var WICKED = {"loggedIn":true,"height":"tall","color":"purple"};';
+		$expected = 'window.WICKED = {"loggedIn":true,"height":"tall","color":"purple"};';
 		$this->assertEqual($result[0], $expected);
 
 		$this->Js->set('loggedIn', true);