@@ -3,6 +3,8 @@ puts "# include_google_js plugin #" puts "# Configuration #" puts "########################################################" puts "" -puts "Add" -puts "IncludeGoogleJs::Config.include_google_js = true" -puts "to environment.rb to use Google's copies of Prototype and Script.aculo.us." \ No newline at end of file +puts "Add" +puts "" +puts ":include_google_js => true" +puts "" +puts "to javascript_include_tag to use Google's copies of Prototype and Script.aculo.us." \ No newline at end of file install.rb @@ -2,20 +2,15 @@ module IncludeGoogleJs @@javascript_expansions = { :defaults => ActionView::Helpers::AssetTagHelper::JAVASCRIPT_DEFAULT_SOURCES.dup } - module Config - mattr_accessor :include_google_js - end - - IncludeGoogleJs::Config.include_google_js ||= true - def self.included(base) base.alias_method_chain :javascript_include_tag, :google_js base.alias_method_chain :expand_javascript_sources, :google_js end def javascript_include_tag_with_google_js(*sources) - options = sources.extract_options!.stringify_keys - cache = options.delete("cache") + options = sources.extract_options!.stringify_keys + cache = options.delete("cache") + @include_google_js = options.delete("include_google_js") if ActionController::Base.perform_caching && cache joined_javascript_name = (cache == true ? "all" : cache) + ".js" @@ -32,7 +27,7 @@ module IncludeGoogleJs google.load("scriptaculous", "1"); </script> #{html} - } if IncludeGoogleJs::Config.include_google_js && (sources.include?(:defaults) || sources.include?(:all)) + } if @include_google_js && (sources.include?(:defaults) || sources.include?(:all)) return html end end @@ -40,7 +35,7 @@ module IncludeGoogleJs def expand_javascript_sources_with_google_js(sources) if sources.include?(:all) all_javascript_files = Dir[File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, '*.js')].collect { |file| File.basename(file).gsub(/\.\w+$/, '') }.sort - if IncludeGoogleJs::Config.include_google_js + if @include_google_js ActionView::Helpers::AssetTagHelper::JAVASCRIPT_DEFAULT_SOURCES.each do |file| all_javascript_files.delete(file) end @@ -50,7 +45,7 @@ module IncludeGoogleJs expanded_sources = [] expanded_sources = sources.collect do |source| determine_source(source, @@javascript_expansions) - end.flatten unless IncludeGoogleJs::Config.include_google_js && sources.include?(:defaults) + end.flatten unless @include_google_js && sources.include?(:defaults) expanded_sources << "application" if sources.include?(:defaults) && file_exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, "application.js")) expanded_sources end lib/include_google_js.rb 17acb3d50dd49bf83b098ad0ef7cf928d236c0a2 Christopher D Warren chris@expectless.com http://github.com/chriswarren/include_google_js/commit/abd7319eef16c871552f0da77a235bde003283b0 abd7319eef16c871552f0da77a235bde003283b0 2008-06-03T14:33:17-07:00 2008-06-03T14:33:17-07:00 Dropped the environment.rb flag, using puts :include_google_js => true as an option on javascript_include_tag instead. 5d445186f37ff171d17513a443263e1c576665fa Christopher D Warren chris@expectless.com