Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

…ect property.
  • Loading branch information...
commit f07df02087ac3d7b7d37f86a5134c590a32ca3ee 1 parent 4be98b6
@markstory markstory authored
View
3  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) . ';');
}
}
View
11 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);
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.