adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Making JsHelper::set() work well with setting the variables to an object property.

Browse source
This commit is contained in:
mark_story 2009-10-14 21:43:50 -04:00
parent 4be98b6ed9
commit f07df02087
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cake/libs/view/helpers/js.php
View file

@ -237,7 +237,8 @@ class JsHelper extends AppHelper {
**/ **/
function _createVars() { function _createVars() {
if (!empty($this->__jsVars)) { 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) . ';');
} }
} }

9
cake/tests/cases/libs/view/helpers/js.test.php
View file

@ -446,9 +446,16 @@ CODE;
$this->Js->set('loggedIn', true); $this->Js->set('loggedIn', true);
$this->Js->set(array('height' => 'tall', 'color' => 'purple')); $this->Js->set(array('height' => 'tall', 'color' => 'purple'));
$this->Js->setVariable = 'WICKED'; $this->Js->setVariable = 'WICKED';
$result = $this->Js->getBuffer(false); $result = $this->Js->getBuffer();
$expected = 'var WICKED = {"loggedIn":true,"height":"tall","color":"purple"};'; $expected = 'var WICKED = {"loggedIn":true,"height":"tall","color":"purple"};';
$this->assertEqual($result[0], $expected); $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);
} }
} }