[Jifty-commit] r6013 - in jifty/trunk: lib/Jifty/Plugin/Chart/Renderer

[Jifty commits]

Author: sartak
Date: Mon Nov 17 19:56:58 2008
New Revision: 6013

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Plugin/Chart/Renderer/GoogleViz.pm

Log:
 r75698 at onn:  sartak | 2008-11-17 19:56:44 -0500
 Minor fixes


Modified: jifty/trunk/lib/Jifty/Plugin/Chart/Renderer/GoogleViz.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/Chart/Renderer/GoogleViz.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/Chart/Renderer/GoogleViz.pm	Mon Nov 17 19:56:58 2008
@@ -3,7 +3,7 @@
 use warnings;
 use base 'Jifty::Plugin::Chart::Renderer';
 
-use Jifty::JSON;
+use Jifty::JSON 'objToJson';
 
 =head2 init
 
@@ -27,20 +27,22 @@
     my $chart_class = $self->chart_class;
     my $load_params = objToJson($self->load_params);
     my $draw_params = objToJson($self->draw_params);
+    my $callback_name = 'callback_' . Jifty->web->serial;
 
     Jifty->web->out(<< "JS_HEADER");
         <script type="text/javascript">
             google.load('visualization', 1, $load_params);
-            google.setOnLoadCallback(function () {
+            google.setOnLoadCallback($callback_name);
+            function $callback_name() {
                 var data = new google.visualization.DataTable();
 JS_HEADER
 
-    $self->render_data;
+    $self->render_data(@_);
 
     Jifty->web->out(<< "JS_FOOTER");
                 var chart = new $chart_class(document.getElementById('$chart_id'));
                 chart.draw(data, $draw_params);
-            });
+            }
         </script>
 JS_FOOTER