projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0af3865
)
work around wacky JSON autoload problem, fallout from #16266 plus probably a JSON...
author
Ivan Kohler
<ivan@freeside.biz>
Sat, 6 Oct 2012 01:01:40 +0000
(18:01 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Sat, 6 Oct 2012 01:01:40 +0000
(18:01 -0700)
httemplate/elements/select-tiered.html
patch
|
blob
|
history
diff --git
a/httemplate/elements/select-tiered.html
b/httemplate/elements/select-tiered.html
index
99b2852
..
7a7982e
100644
(file)
--- a/
httemplate/elements/select-tiered.html
+++ b/
httemplate/elements/select-tiered.html
@@
-68,8
+68,8
@@
main argument list, and will be applied to the last tier.
</SELECT>
<% $tier->{after} %>
% } #foreach $tier
</SELECT>
<% $tier->{after} %>
% } #foreach $tier
+
<SCRIPT type="text/javascript">
<SCRIPT type="text/javascript">
-% my $json = JSON->new->canonical; #sort
var <% $pre %>tiers = <% $json->encode($tiers_by_key) %>;
var <% $pre %>curr_values = <% $json->encode($curr_values) %>;
function <% $pre %>select_change(select_this, i) {
var <% $pre %>tiers = <% $json->encode($tiers_by_key) %>;
var <% $pre %>curr_values = <% $json->encode($curr_values) %>;
function <% $pre %>select_change(select_this, i) {
@@
-120,6
+120,16
@@
my %opt = @_;
my $pre = $opt{prefix} || '';
my $tiers = $opt{tiers} or die "no tiers defined";
my $pre = $opt{prefix} || '';
my $tiers = $opt{tiers} or die "no tiers defined";
+#my $json = JSON->new()->canonical(); #sort
+# something super weird and broken going on with JSON's auto-loading, just
+# using JSON alone errors out with
+# Can't locate object method "new" via package "null" (perhaps you forgot to
+# load "null"?)
+# yes, "null", not "JSON". so instead, using JSON::XS explicity...
+use JSON::XS;
+my $json = JSON::XS->new();
+$json->canonical;
+
my $i;
for( $i = 0; $i < @$tiers; $i++ ) {
my $tier = $tiers->[$i];
my $i;
for( $i = 0; $i < @$tiers; $i++ ) {
my $tier = $tiers->[$i];