Changeset 5487

Timestamp:

11/11/06 18:29:11 (2 years ago)

Author:

sam

Message:

Remove JavaScriptLiteral in favor of ActiveSupport::JSON::Variable.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/prototype_helper.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Remove JavaScriptLiteral in favor of ActiveSupport::JSON::Variable. [Sam Stephenson]
-
-* Sync ActionController::StatusCodes::STATUS_CODES with http://www.iana.org/assignments/http-status-codes.  #6586 [dkubb]

trunk/actionpack/lib/action_view/helpers/prototype_helper.rb

@@ -392 +392 @@
-          # expression as an argument to another JavaScriptGenerator method.
-          def literal(code)
-JavaScriptLiteral.new(code
+ActiveSupport::JSON::Variable.new(code.to_s
-          end
-          
@@ -686 +686 @@
-        end
-        callbacks
-      end
-    end
-
-    # Bypasses string escaping so you can pass around raw JavaScript
-    class JavaScriptLiteral < String #:nodoc:
-      def to_json
-        to_s
-      end
-    end