Changeset 809

Timestamp:

04/18/08 15:47:12 (5 months ago)

Author:

seancribbs

Message:

Move extra initialization into after_initialize block.

Files:

• trunk/radiant/CHANGELOG (modified) (1 diff)
• trunk/radiant/config/environment.rb (modified) (1 diff)
• trunk/radiant/lib/generators/instance/templates/instance_environment.rb (modified) (1 diff)
• trunk/radiant/lib/radiant/initializer.rb (modified) (1 diff)

trunk/radiant/CHANGELOG

@@ -2 +2 @@
-
-=== SVN
+* Move extra initialization into after_initialize block. [Sean Cribbs]
-* Notice area now fades away after 3 seconds. [Andrew O'Brien]
-* <r:find /> now accepts paths relative to the current page. [Andrew O'Brien]

trunk/radiant/config/environment.rb

@@ -68 +68 @@
-    %{<div class="error-with-field">#{html} <small class="error">&bull; #{[instance.error_message].flatten.first}</small></div>}
-  end
+  
+  config.after_initialize do
+    # Add new inflection rules using the following format:
+    Inflector.inflections do |inflect|
+      inflect.uncountable 'config'
+      inflect.uncountable 'meta'
+    end
+
+    # Auto-require text filters
+    Dir["#{RADIANT_ROOT}/app/models/*_filter.rb"].each do |filter|
+      require_dependency File.basename(filter).sub(/\.rb$/, '')
+    end
+
+    # Response Caching Defaults
+    ResponseCache.defaults[:directory] = ActionController::Base.page_cache_directory
+    ResponseCache.defaults[:logger]    = ActionController::Base.logger
+  end
-end
-
-# Add new inflection rules using the following format:
-Inflector.inflections do |inflect|
-  inflect.uncountable 'config'
-  inflect.uncountable 'meta'
-end
-
-# Auto-require text filters
-Dir["#{RADIANT_ROOT}/app/models/*_filter.rb"].each do |filter|
-  require_dependency File.basename(filter).sub(/\.rb$/, '')
-end
-
-# Response Caching Defaults
-ResponseCache.defaults[:directory] = ActionController::Base.page_cache_directory
-ResponseCache.defaults[:logger]    = ActionController::Base.logger

trunk/radiant/lib/generators/instance/templates/instance_environment.rb

@@ -68 +68 @@
-    %{<div class="error-with-field">#{html} <small class="error">&bull; #{[instance.error_message].flatten.first}</small></div>}
-  end
+  
+  config.after_initialize do
+    # Add new inflection rules using the following format:
+    Inflector.inflections do |inflect|
+      inflect.uncountable 'config'
+      inflect.uncountable 'meta'
+    end
+
+    # Auto-require text filters
+    Dir["#{RADIANT_ROOT}/app/models/*_filter.rb"].each do |filter|
+      require_dependency File.basename(filter).sub(/\.rb$/, '')
+    end
+
+    # Response Caching Defaults
+    ResponseCache.defaults[:directory] = ActionController::Base.page_cache_directory
+    ResponseCache.defaults[:logger]    = ActionController::Base.logger
+  end
-end
-
-# Add new inflection rules using the following format:
-Inflector.inflections do |inflect|
-  inflect.uncountable 'config'
-  inflect.uncountable 'meta'
-end
-
-# Auto-require text filters
-Dir["#{RADIANT_ROOT}/app/models/*_filter.rb"].each do |filter|
-  require_dependency File.basename(filter).sub(/\.rb$/, '')
-end
-
-# Response Caching Defaults
-ResponseCache.defaults[:directory] = ActionController::Base.page_cache_directory
-ResponseCache.defaults[:logger]    = ActionController::Base.logger

trunk/radiant/lib/radiant/initializer.rb

@@ -107 +107 @@
-
-    def after_initialize
+      super
-      extension_loader.activate_extensions
-      super
-    end
-