Permalink
Browse files

moving include of ScriptaculousHelper into PrototypeHelper, ActionVie…

…w should know as little as possible about individual frameworks
  • Loading branch information...
1 parent 37ad575 commit 9f5cb3d3b48d0e7d702144d87208ac18778e3d38 @erikstmartin erikstmartin committed with stefanpenner Jan 24, 2010
Showing with 3 additions and 2 deletions.
  1. +0 −2 actionpack/lib/action_view/helpers.rb
  2. +3 −0 actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -20,7 +20,6 @@ module Helpers #:nodoc:
autoload :RecordIdentificationHelper, 'action_view/helpers/record_identification_helper'
autoload :RecordTagHelper, 'action_view/helpers/record_tag_helper'
autoload :SanitizeHelper, 'action_view/helpers/sanitize_helper'
- autoload :ScriptaculousHelper, 'action_view/helpers/scriptaculous_helper'
autoload :TagHelper, 'action_view/helpers/tag_helper'
autoload :TextHelper, 'action_view/helpers/text_helper'
autoload :TranslationHelper, 'action_view/helpers/translation_helper'
@@ -53,7 +52,6 @@ module ClassMethods
include RecordIdentificationHelper
include RecordTagHelper
include SanitizeHelper
- include ScriptaculousHelper
include TagHelper
include TextHelper
include TranslationHelper
@@ -1,6 +1,7 @@
require 'set'
require 'active_support/json'
require 'active_support/core_ext/object/returning'
+require 'action_view/helpers/scriptaculous_helper'
module ActionView
module Helpers
@@ -73,6 +74,8 @@ module Helpers
# See JavaScriptGenerator for information on updating multiple elements
# on the page in an Ajax response.
module PrototypeHelper
+ include ScriptaculousHelper
+
unless const_defined? :CALLBACKS
CALLBACKS = Set.new([ :create, :uninitialized, :loading, :loaded,
:interactive, :complete, :failure, :success ] +

0 comments on commit 9f5cb3d

Please sign in to comment.