[Jifty-commit] r7316 - in plugins: Jifty-Plugin-Chart/lib/Jifty/Plugin/Chart/Renderer Jifty-Plugin-Chart/lib/Jifty/Plugin/Chart/Renderer/GoogleViz

[Jifty commits]

Author: trs
Date: Tue Jul 14 18:02:28 2009
New Revision: 7316

Modified:
   plugins/   (props changed)
   plugins/Jifty-Plugin-Chart/lib/Jifty/Plugin/Chart/Renderer/GoogleViz.pm
   plugins/Jifty-Plugin-Chart/lib/Jifty/Plugin/Chart/Renderer/GoogleViz/AnnotatedTimeline.pm

Log:
 r48599 at zot:  tom | 2009-07-14 18:02:20 -0400
 Charts are now able to accept options


Modified: plugins/Jifty-Plugin-Chart/lib/Jifty/Plugin/Chart/Renderer/GoogleViz.pm
==============================================================================
--- plugins/Jifty-Plugin-Chart/lib/Jifty/Plugin/Chart/Renderer/GoogleViz.pm	(original)
+++ plugins/Jifty-Plugin-Chart/lib/Jifty/Plugin/Chart/Renderer/GoogleViz.pm	Tue Jul 14 18:02:28 2009
@@ -32,9 +32,9 @@
     my $chart_id = 'chart_' . Jifty->web->serial;
     my $chart_class = $self->chart_class;
     my $load_params = objToJson($self->load_params);
-    my $draw_params = objToJson($self->draw_params);
+    my $draw_params = objToJson($self->draw_params($args{options}));
     my $callback_name = 'callback_' . Jifty->web->serial;
-
+    
     Jifty->web->out(<< "JS_HEADER");
         <script type="text/javascript">
             google.load('visualization', 1, $load_params);
@@ -58,7 +58,7 @@
             style="width: $args{width}; height: $args{height};"
             id="$chart_id"
         ></div>
-    });
+    }); #"
 
     return;
 }

Modified: plugins/Jifty-Plugin-Chart/lib/Jifty/Plugin/Chart/Renderer/GoogleViz/AnnotatedTimeline.pm
==============================================================================
--- plugins/Jifty-Plugin-Chart/lib/Jifty/Plugin/Chart/Renderer/GoogleViz/AnnotatedTimeline.pm	(original)
+++ plugins/Jifty-Plugin-Chart/lib/Jifty/Plugin/Chart/Renderer/GoogleViz/AnnotatedTimeline.pm	Tue Jul 14 18:02:28 2009
@@ -5,9 +5,12 @@
 
 use constant packages_to_load => 'annotatedtimeline';
 use constant chart_class => 'google.visualization.AnnotatedTimeLine';
-use constant draw_params => {
-    displayAnnotations => "true",
-};
+
+sub draw_params {
+    my $self = shift;
+    my $opts = shift || {};
+    return { displayAnnotations => 'true', %$opts };
+}
 
 1;