X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAction%2FSerialize%2FJSONP.pm;h=82e6c00f919743cdf1dee44f06bbf3d7441759ef;hb=04eaf27858960701f33ae0a3c7676bf095b81762;hp=705a5da55d12802d1b4b4818cdc9168f3785b802;hpb=c3c700380f69a811ca62053083f3b43d74255891;p=catagits%2FCatalyst-Action-REST.git diff --git a/lib/Catalyst/Action/Serialize/JSONP.pm b/lib/Catalyst/Action/Serialize/JSONP.pm index 705a5da..82e6c00 100644 --- a/lib/Catalyst/Action/Serialize/JSONP.pm +++ b/lib/Catalyst/Action/Serialize/JSONP.pm @@ -1,16 +1,20 @@ package Catalyst::Action::Serialize::JSONP; use Moose; use namespace::autoclean; -BEGIN {extends 'Catalyst::Action::Serialize::JSON'}; -after 'execute' => sub { +extends 'Catalyst::Action::Serialize::JSON'; + +our $VERSION = '0.91'; +$VERSION = eval $VERSION; + +after 'execute' => sub { my $self = shift; my ($controller, $c) = @_; my $callback_key = ( $controller->{'serialize'} ? $controller->{'serialize'}->{'callback_key'} : - $controller->{'callback_key'} + $controller->{'callback_key'} ) || 'callback'; my $callback_value = $c->req->param($callback_key); @@ -18,10 +22,12 @@ after 'execute' => sub { if ($callback_value =~ /^\w+$/) { $c->res->content_type('text/javascript'); $c->res->output($callback_value.'('.$c->res->output().');'); - } else { + } else { warn 'Callback: '.$callback_value.' will not generate valid Javascript. Falling back to JSON output'; } } }; +__PACKAGE__->meta->make_immutable; + 1;