public/lowpro.jquery.js @@ -27,7 +27,8 @@ Methods and Options default is `:p` * `:form_class` - set's the class attribute for the form tag * `:form_id` - set's the id attribute for the form tag -* `ujs_remote_form (selector, options)` + * `:wrapper_class` - set's the class for the wrapper tag. default: `nil` +* `lowpro_remote_form (selector, options)` * `selector`: the CSS selector used to specify which element(s) to apply this observer to. * `options`: * all the standard `options_for_ajax` options used in all the `remote` Prototype helpers README.markdown @@ -3,7 +3,7 @@ module ActionButton module Helpers - ## + # # This will add a button that will execute the given action, this is done by # wrapping the button in a form element. This allows destructive actions to be # packaged in a highly styleable element and still be "safe" by not using GET's. @@ -23,13 +23,13 @@ module ActionButton # * a wrapper is needed so XHTML 1.0 Strict will validate # * <tt>:form_class</tt> - set's the class attribute for the form tag. # * <tt>:form_id</tt> - set's the id attribute for the form tag. + # * <tt>:wrapper_class</tt> - set's the class for the wrapper tag. default: <tt>nil</tt> # # ==== Example # <%= action_button 'delete_order', "Delete this Order", {:action => :delete, :id => order}, {:method => :delete} %> # def action_button(name, content, url_for_options = {}, options = {}, *parameters_for_url) - defaults = {:class => name} - options = defaults.merge(options) + options.reverse_merge!({:class => name}) wrapper_tag = options.delete(:wrapper_tag) || :p if options[:id].blank? @@ -43,14 +43,13 @@ module ActionButton output = form_tag(url_for_options, options.merge(:class => "#{form_class}", :id => "#{form_id}"), *parameters_for_url) options.delete(:method) - output << "\n" - output << content_tag(wrapper_tag, button_tag(id, content, 'submit', options) ) - output << "\n</form>" + output << "\n<#{wrapper_tag}#{options[:wrapper_class].blank? ? '' : ('class="'+options.delete(:wrapper_class)+'"')}" + output << button_tag(id, content, 'submit', options) + output << "</#{wrapper_tag}>\n</form>" return output end - ## # Creates a button tag with the content passed to the content parameter inside. # It also sets the <tt>name</tt> attribute, and the <tt>type</tt> attribute on the tag # bassed on the parameters provided. @@ -59,11 +58,10 @@ module ActionButton content_tag(:button, content, html_options.merge(:type => type, :name => name, :id => name)) end - ## # Creates javascript to create a remote form event observer with the lowpro library for all # elements that match the CSS selector specified. # - def ujs_remote_form(selector, options = {}) + def lowpro_remote_form(selector, options = {}) js_options = custom_remote_options(options) <<JS @@ -72,6 +70,13 @@ module ActionButton }); JS end + + # Creates javascript to create a remote form event observer with the jQuery lowpro library + # for all elements that match the CSS selector specified. + # + def jquery_lowpro_remote_form(selector, options = {}) + "$('#{selector}').attach(Remote.Form, #{options_for_javascript(options)});" + end private lib/action_button.rb @@ -1,9 +1,15 @@ namespace :action_button do - require 'fileutils' - - desc "Replace the old lowpro.js file witht the new one" - task :update_js do - lowpro_js = File.dirname(__FILE__) + '/../../../public/javascripts/lowpro.js' - FileUtils.cp File.dirname(__FILE__) + '/public/lowpro.js', lowpro_js - end + require 'fileutils' + + desc "Install lowpro.js" + task :install_lowpro do + lowpro_js = File.dirname(__FILE__) + '/../../../public/javascripts/lowpro.js' + FileUtils.cp File.dirname(__FILE__) + '/public/lowpro.js', lowpro_js + end + + desc "Install lowpro.jquery.js" + task :install_jquery_lowpro do + jquery_lowpro_js = File.dirname(__FILE__) + '/../../../public/javascripts/lowpro.jquery.js' + FileUtils.cp File.dirname(__FILE__) + '/public/lowpro.jquery.js', jquery_lowpro_js + end end tasks/action_button_tasks.rake @@ -152,8 +152,8 @@ class ActionButtonTest < ActiveSupport::TestCase context 'ujs_remote_form script with options' do setup do - @script = ujs_remote_form 'form.action', :confirm => 'Do you want to do this?', - :update => 'some-id', :with => "'size=' + $F('itemSize')" + @script = lowpro_remote_form 'form.action', :confirm => 'Do you want to do this?', + :update => 'some-id', :with => "'size=' + $F('itemSize')" end should 'have lowpro event listenter and slector' do @@ -181,8 +181,8 @@ class ActionButtonTest < ActiveSupport::TestCase context 'ujs_remote_form script with options' do setup do - @script = ujs_remote_form 'form.action', :update => { :success => 'items-div-id', - :failure => 'error-flash'} + @script = lowpro_remote_form 'form.action', :update => { :success => 'items-div-id', + :failure => 'error-flash'} end should 'have an option for both update options' do test/action_button_test.rb @@ -10,7 +10,7 @@ require 'active_support' require 'action_controller' require 'action_view' require 'rexml/document' -require 'html/document' +require 'action_controller/vendor/html-scanner' require 'active_support/test_case' require File.join(PLUGIN_ROOT, 'lib/action_button.rb') test/test_helper.rb install.rb 1ac4c42015c00de82ed3ffe1163de27bb65627ab Brian Landau brianjlandau@gmail.com http://github.com/vigetlabs/action_button/commit/07fcd6e35ab44c0a42f2f5a7be4bb493f48d1420 07fcd6e35ab44c0a42f2f5a7be4bb493f48d1420 2009-02-25T10:53:56-08:00 2009-02-25T10:53:56-08:00 Add ability to have a class on the wrapper tag. Also add a helper for lowpro for jQuery. 3e6fe44126a39b9017d77978683a5492e78fd967 Brian Landau brianjlandau@gmail.com