Changeset 2191

Timestamp:

09/11/05 07:52:53 (3 years ago)

Author:

david

Message:

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

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_controller/macros (added)
• trunk/actionpack/lib/action_controller/macros/auto_complete.rb (moved) (moved from trunk/actionpack/lib/action_controller/auto_complete.rb) (1 diff)
• trunk/actionpack/lib/action_controller/macros/in_place_editing.rb (added)
• trunk/actionpack/lib/action_view/helpers/form_helper.rb (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/java_script_macros_helper.rb (added)
• trunk/actionpack/lib/action_view/helpers/javascript_helper.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Moved auto-completion and in-place editing into the Macros module and their helper counterparts into JavaScriptMacrosHelper
+
+* 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]
-
-* Added :disabled option to all data selects that'll make the elements inaccessible for change #2167, #253 [eigentone]

trunk/actionpack/lib/action_controller.rb

@@ -50 +50 @@
-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'
@@ -72 +73 @@
-  include ActionController::Verification
-  include ActionController::Streaming
-  include ActionController::AutoComplete
-  include ActionController::SessionManagement
+  include ActionController::Macros::AutoComplete
+  include ActionController::Macros::InPlaceEditing
-end

trunk/actionpack/lib/action_controller/macros/auto_complete.rb

@@ -1 +1 @@
-module ActionController
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
-            
-
+  
-
-
+
+
-        end
-      end

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

@@ -235 +235 @@
-        tag_text << ">True</option></select>"
-      end
-
+
+
+
+
+
-      def object
-        @template_object.instance_variable_get "@#{@object_name}"

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

@@ -343 +343 @@
-          build_observer('Form.EventObserver', form_id, options)
-        end
-      end
-      
-           
-      # Adds AJAX autocomplete functionality to the text input field with the 
-      # DOM ID specified by +field_id+.
-      #
-      # This function expects that the called action returns a HTML <ul> list,
-      # or nothing if no entries should be displayed for autocompletion.
-      #
-      # You'll probably want to turn the browser's built-in autocompletion off,
-      # su be sure to include a autocomplete="off" attribute with your text
-      # input field.
-      # 
-      # Required +options+ are:
-      # <tt>:url</tt>::       Specifies the DOM ID of the element whose
-      #                       innerHTML should be updated with the autocomplete
-      #                       entries returned by XMLHttpRequest.
-      # 
-      # Addtional +options+ are:
-      # <tt>:update</tt>::    Specifies the DOM ID of the element whose 
-      #                       innerHTML should be updated with the autocomplete
-      #                       entries returned by the AJAX request. 
-      #                       Defaults to field_id + '_auto_complete'
-      # <tt>:with</tt>::      A JavaScript expression specifying the
-      #                       parameters for the XMLHttpRequest. This defaults
-      #                       to 'fieldname=value'.
-      # <tt>:indicator</tt>:: Specifies the DOM ID of an elment which will be
-      #                       displayed while autocomplete is running. 
-      def auto_complete_field(field_id, options = {})
-        function =  "new Ajax.Autocompleter("
-        function << "'#{field_id}', "
-        function << "'" + (options[:update] || "#{field_id}_auto_complete") + "', "
-        function << "'#{url_for(options[:url])}'"
-        
-        js_options = {}
-        js_options[:tokens] = array_or_string_for_javascript(options[:tokens]) if options[:tokens]
-        js_options[:callback]   = "function(element, value) { return #{options[:with]} }" if options[:with]
-        js_options[:indicator]  = "'#{options[:indicator]}'" if options[:indicator]
-        function << (', ' + options_for_javascript(js_options) + ')')
-
-        javascript_tag(function)
-      end
-      
-      # Use this method in your view to generate a return for the AJAX automplete requests.
-      #
-      # Example action:
-      #
-      #   def auto_complete_for_item_title
-      #     @items = Item.find(:all, 
-      #       :conditions => [ 'LOWER(description) LIKE ?', 
-      #       '%' + request.raw_post.downcase + '%' ])
-      #     render :inline => '<%= auto_complete_result(@items, 'description') %>'
-      #   end
-      #
-      # The auto_complete_result can of course also be called from a view belonging to the 
-      # auto_complete action if you need to decorate it further.
-      def auto_complete_result(entries, field, phrase = nil)
-        return unless entries
-        items = entries.map { |entry| content_tag("li", phrase ? highlight(entry[field], phrase) : h(entry[field])) }
-        content_tag("ul", items.uniq)
-      end
-      
-      # Wrapper for text_field with added AJAX autocompletion functionality.
-      #
-      # In your controller, you'll need to define an action called
-      # auto_complete_for_object_method to respond the AJAX calls,
-      # 
-      # See the RDoc on ActionController::AutoComplete to learn more about this.
-      def text_field_with_auto_complete(object, method, tag_options = {}, completion_options = {})
-        (completion_options[:skip_style] ? "" : auto_complete_stylesheet) +
-        text_field(object, method, { :autocomplete => "off" }.merge!(tag_options)) +
-        content_tag("div", "", :id => "#{object}_#{method}_auto_complete", :class => "auto_complete") +
-        auto_complete_field("#{object}_#{method}", { :url => { :action => "auto_complete_for_#{object}_#{method}" } }.update(completion_options))
-      end
-