Author: spadkins
Date: Wed Apr 16 07:20:58 2008
New Revision: 11090
Modified:
p5ee/trunk/App-Widget-ExtJS/lib/App/Widget/ExtJS.pm
Log:
When serializing javascript, do not add quotes to the keyword renderer.
Modified: p5ee/trunk/App-Widget-ExtJS/lib/App/Widget/ExtJS.pm
==============================================================================
--- p5ee/trunk/App-Widget-ExtJS/lib/App/Widget/ExtJS.pm (original)
+++ p5ee/trunk/App-Widget-ExtJS/lib/App/Widget/ExtJS.pm Wed Apr 16
07:20:58 2008
@[EMAIL PROTECTED]
-42,7 +42,7 @[EMAIL PROTECTED]
$modified_value .= "\n " if (!$oneline);
for (my $i = 0; $i <= $#$value; $i++) {
$val = $value->[$i];
- if (ref($val)) {
+ if (ref($val)) {
$modified_value .= $self->serialize_as_javascript($val);
}
elsif ($val =~ /^(false|true)$/) {
@[EMAIL PROTECTED]
-81,7 +81,13 @[EMAIL PROTECTED]
$modified_value .= $val;
}
else {
- $modified_value .= "'$val'";
+ # rendering functions should not be quoted.
+ if ($key =~ /renderer/i) {
+ $modified_value .= $val;
+ }
+ else {
+ $modified_value .= "'$val'";
+ };
}
$modified_value .= ", ";
}
@[EMAIL PROTECTED]
-148,7 +154,7 @[EMAIL PROTECTED]
$js_conf .= ",\n \"$attrib\" : \"" .
$self->escape_double_quoted_value($value) . "\"";
}
}
-
+
if (defined $self->{js_value_domain}) {
my $value_domain_name = $self->{js_value_domain};
$self->include_value_domain($value_domain_name);
@[EMAIL PROTECTED]
-168,7 +174,7 @[EMAIL PROTECTED]
$domain_alias = $self->{js_domain}{$domain_name};
$domain_alias = $domain_name if (!$domain_alias ||
$domain_alias eq "1");
-
+
$value_domain = $context->value_domain($domain_name);
($values, $labels) = $value_domain->values_labels();
@[EMAIL PROTECTED]
-208,7 +214,7 @[EMAIL PROTECTED]
my ($values, $labels) = $self->values_labels();
my ($values_text, $i);
my $labels_text = "";
-
+
if ($#$values > -1) {
$values_text = ",\n \"values\" : [";
for ($i = 0; $i <= $#$values; $i++) {
@[EMAIL PROTECTED]
-217,7 +223,7 @[EMAIL PROTECTED]
$values_text .= " \"$values->[$i]\"";
}
$values_text .= "\n ]";
-
+
if ($labels && %$labels) {
$labels_text = ",\n \"labels\" : {";
for ($i = 0; $i <= $#$values; $i++) {
|
