diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-09-11 07:52:53 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-09-11 07:52:53 +0000 |
| commit | c1007377ba010448e55030c37f3fee24208e9912 (patch) | |
| tree | ff9b30149ef78f5b41b7ac1e5c281ab6ed1adf6f /actionpack/lib/action_controller.rb | |
| parent | dc2a3af13378635131fabe6dcfb2e99bb50cc491 (diff) | |
| download | rails-c1007377ba010448e55030c37f3fee24208e9912.tar.gz rails-c1007377ba010448e55030c37f3fee24208e9912.tar.bz2 rails-c1007377ba010448e55030c37f3fee24208e9912.zip | |
Added in-place editing support in the spirit of auto complete with ActionController::Base.in_place_edit_for, JavascriptHelper#in_place_editor_field, and Javascript support from script.aculo.us #2038 [Jon Tirsen] Moved auto-completion and in-place editing into the Macros module and their helper counterparts into JavaScriptMacrosHelper
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2191 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller.rb')
| -rwxr-xr-x | actionpack/lib/action_controller.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index cbcb35b686..0eaf630bbe 100755 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -49,8 +49,9 @@ require 'action_controller/caching' require 'action_controller/components' require 'action_controller/verification' require 'action_controller/streaming' -require 'action_controller/auto_complete' require 'action_controller/session_management' +require 'action_controller/macros/auto_complete' +require 'action_controller/macros/in_place_editing' require 'action_view' ActionController::Base.template_class = ActionView::Base @@ -71,6 +72,7 @@ ActionController::Base.class_eval do include ActionController::Components include ActionController::Verification include ActionController::Streaming - include ActionController::AutoComplete include ActionController::SessionManagement + include ActionController::Macros::AutoComplete + include ActionController::Macros::InPlaceEditing end |