Reduced the amount of data sent to the client.
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@827 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
@@ -268,14 +268,21 @@ class FormatHelper extends AppHelper {
|
||||
|
||||
|
||||
// Helper function to convert PHP vars to javascript
|
||||
function phpVarToJavascript($var, $name = '', $depth='', $special = false) {
|
||||
function phpVarToJavascript($var, $name = '', $depth='', $special = false, $pretty = false) {
|
||||
|
||||
// Establish a prefix to use before printing $var
|
||||
$prefix = $depth;
|
||||
if ($pretty) {
|
||||
$prefix = $depth;
|
||||
$pretty_sp = " ";
|
||||
$pretty_nl = "\n";
|
||||
}
|
||||
else {
|
||||
$prefix = $pretty_sp = $pretty_nl = '';
|
||||
}
|
||||
|
||||
// If given a name, set it up JS style
|
||||
if ($name)
|
||||
$prefix .= $name . ": ";
|
||||
$prefix .= $name . ":" . $pretty_sp;
|
||||
|
||||
if (!isset($var))
|
||||
return $prefix . 'null';
|
||||
@@ -328,22 +335,22 @@ class FormatHelper extends AppHelper {
|
||||
// PHP array indices can be a mix of integer and string based.
|
||||
// Just guess here, unless flagged as a special case.
|
||||
if (isset($var[0]) || $special)
|
||||
return ($prefix . "[\n"
|
||||
. implode(",\n",
|
||||
return ($prefix . "[" . $pretty_nl
|
||||
. implode("," . $pretty_nl,
|
||||
array_map(array('FormatHelper', 'phpVarToJavascript'),
|
||||
array_values($var),
|
||||
array(),
|
||||
array_fill(0, count($var), $depth.' ')
|
||||
))
|
||||
. "\n$depth]");
|
||||
. ($pretty ? "\n$depth" : '') . "]");
|
||||
|
||||
return ($prefix . "{\n"
|
||||
. implode(",\n",
|
||||
return ($prefix . "{" . $pretty_nl
|
||||
. implode("," . $pretty_nl,
|
||||
array_map(array('FormatHelper', 'phpVarToJavascript'),
|
||||
array_values($var), array_keys($var),
|
||||
array_fill(0, count($var), $depth.' ')
|
||||
))
|
||||
. "\n$depth}");
|
||||
. ($pretty ? "\n$depth" : '') . "}");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user