X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FAction%2FSerialize%2FJSONP.pm;h=62df74f24602e4dd617754a23a8374b4ccd934f1;hb=7566d72f425ab3a870f1d6c8945c43f4edeedf2a;hp=44946d307681700bb7d5942f92a4c7747caa75a8;hpb=62d47dd140603ca63359a463c854fb761be33bea;p=catagits%2FCatalyst-Action-REST.git diff --git a/lib/Catalyst/Action/Serialize/JSONP.pm b/lib/Catalyst/Action/Serialize/JSONP.pm index 44946d3..62df74f 100644 --- a/lib/Catalyst/Action/Serialize/JSONP.pm +++ b/lib/Catalyst/Action/Serialize/JSONP.pm @@ -4,25 +4,30 @@ use namespace::autoclean; extends 'Catalyst::Action::Serialize::JSON'; -after 'execute' => sub { +our $VERSION = '1.13'; +$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); if ($callback_value) { - if ($callback_value =~ /^\w+$/) { + 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;