honkster-jelly 0.8.2 → 0.8.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 8
-:patch: 2
+:patch: 3
 :major: 0

data/generators/jelly/templates/javascripts/jelly.js

@@ -2,7 +2,7 @@
  *  Jelly. a sweet unobtrusive javascript framework
  *  for jQuery and Rails
  *
- *  version 0.8.2
+ *  version 0.8.3
  *
  * Copyright (c) 2009 Pivotal Labs
  * Licensed under the MIT license.

data/jelly.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jelly}
-  s.version = "0.8.2"
+  s.version = "0.8.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pivotal Labs, Inc"]

data/lib/jelly/jelly_controller.rb

@@ -29,19 +29,13 @@ module JellyController
       when :iframe
         "<textarea>#{jelly_callback_erb_template}</textarea>"
       when :jsonp
-        @jsonp_callback = params[:callback]
-        jelly_callback_erb_template
+        "#{params[:callback]}(#{jelly_callback_erb_template});"
       else
         jelly_callback_erb_template
     end
   end
 
   def jelly_callback_erb_template
-    <<-ERB
-      <%= begin
-        json = instance_eval(&@jelly_block).to_json
-        @jsonp_callback ? "\#{@jsonp_callback}(\#{json});" : json
-      end %>
-    ERB
+    "<%= instance_eval(&@jelly_block).to_json %>"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: honkster-jelly
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors: 
 - Pivotal Labs, Inc