Skip to content
Permalink
Browse files

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

…ect property.
  • Loading branch information...
markstory committed Oct 15, 2009
1 parent 170ed29 commit 6c956c27eec7cd3881dd4a9b4b9872b1b0252bab
Showing with 11 additions and 3 deletions.
  1. +2 −1 cake/libs/view/helpers/js.php
  2. +9 −2 cake/tests/cases/libs/view/helpers/js.test.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) . ';');
}
}
@@ -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);
}
}

0 comments on commit 6c956c2

Please sign in to comment.
You can’t perform that action at this time.