Changeset 3667

Timestamp:

02/26/06 14:20:21 (3 years ago)

Author:

madrobby

Message:

Added script.aculo.us drag and drop helpers to RJS [Thomas Fuchs]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/prototype_helper.rb (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/scriptaculous_helper.rb (modified) (4 diffs)
• trunk/actionpack/test/template/prototype_helper_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added script.aculo.us drag and drop helpers to RJS [Thomas Fuchs]. Examples:
+
+    page.draggable 'product-1'
+    page.drop_receiving 'wastebasket', :url => { :action => 'delete' }
+    page.sortable 'todolist', :url => { action => 'change_order' }
-
-* Fixed that form elements would strip the trailing [] from the first parameter #3545 [ruby@bobsilva.com]

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

@@ -566 +566 @@
-        end
-        
-Scriptaculo
+script.aculo.
-        # ActionView::Helpers::ScriptaculousHelper for more information.
-        def visual_effect(name, id, options = {})
-          record @context.send(:visual_effect, name, id, options)
+        end
+        
+        # Creates a script.aculo.us sortable element. Useful
+        # to recreate sortable elements after items get added
+        # or deleted.
+        # See ActionView::Helpers::ScriptaculousHelper for more information.
+        def sortable(id, options = {})
+          record @context.send(:sortable_element_js, id, options)
+        end
+        
+        # Creates a script.aculo.us draggable element.
+        # See ActionView::Helpers::ScriptaculousHelper for more information.
+        def draggable(id, options = {})
+          record @context.send(:draggable_element_js, id, options)
+        end
+        
+        # Creates a script.aculo.us drop receiving element.
+        # See ActionView::Helpers::ScriptaculousHelper for more information.
+        def drop_receiving(id, options = {})
+          record @context.send(:drop_receiving_element_js, id, options)
-        end
-        

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

@@ -68 +68 @@
-      # http://script.aculo.us for more documentation.
-      def sortable_element(element_id, options = {})
+        javascript_tag(sortable_element_js(element_id, options).chop!)
+      end
+      
+      def sortable_element_js(element_id, options = {}) #:nodoc:
-        options[:with]     ||= "Sortable.serialize('#{element_id}')"
-        options[:onUpdate] ||= "function(){" + remote_function(options) + "}"
@@ -79 +83 @@
-        options[:only] = array_or_string_for_javascript(options[:only]) if options[:only]
-  
-javascript_tag("Sortable.create('#{element_id}', #{options_for_javascript(options)})"
+%(Sortable.create('#{element_id}', #{options_for_javascript(options)});
-      end
-
@@ -88 +92 @@
-      # 
-      # You can change the behaviour with various options, see
- 
+
-      def draggable_element(element_id, options = {})
-
+
+
+
+
+
-      end
-
@@ -105 +113 @@
-      # http://script.aculo.us for more documentation.
-      def drop_receiving_element(element_id, options = {})
+        javascript_tag(drop_receiving_element_js(element_id, options).chop!)
+      end
+      
+      def drop_receiving_element_js(element_id, options = {}) #:nodoc:
-        options[:with]     ||= "'id=' + encodeURIComponent(element.id)"
-        options[:onDrop]   ||= "function(element){" + remote_function(options) + "}"
-        options.delete_if { |key, value| PrototypeHelper::AJAX_OPTIONS.include?(key) }
-
+
-        options[:accept] = array_or_string_for_javascript(options[:accept]) if options[:accept]    
-        options[:hoverclass] = "'#{options[:hoverclass]}'" if options[:hoverclass]
-
-javascript_tag("Droppables.add('#{element_id}', #{options_for_javascript(options)})"
+      
+%(Droppables.add('#{element_id}', #{options_for_javascript(options)});
-      end
-    end

trunk/actionpack/test/template/prototype_helper_test.rb

@@ -4 +4 @@
-  include ActionView::Helpers::JavaScriptHelper
-  include ActionView::Helpers::PrototypeHelper
+  include ActionView::Helpers::ScriptaculousHelper
-  
-  include ActionView::Helpers::UrlHelper
@@ -256 +257 @@
-    assert_equal %($$('p.welcome b').first().hide();), @generator.to_s
-  end
+  
+  def test_visual_effect
+    assert_equal %(new Effect.Puff('blah',{});), 
+      @generator.visual_effect(:puff,'blah')
+  end 
+  
+  def test_visual_effect_toggle
+    assert_equal %(Effect.toggle('blah','appear',{});), 
+      @generator.visual_effect(:toggle_appear,'blah')
+  end
+  
+  def test_sortable
+    assert_equal %(Sortable.create('blah', {onUpdate:function(){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:Sortable.serialize('blah')})}});), 
+      @generator.sortable('blah', :url => { :action => "order" })
+  end
+  
+  def test_draggable
+    assert_equal %(new Draggable('blah', {});), 
+      @generator.draggable('blah')
+  end
+  
+  def test_drop_receiving
+    assert_equal %(Droppables.add('blah', {onDrop:function(element){new Ajax.Request('http://www.example.com/order', {asynchronous:true, evalScripts:true, parameters:'id=' + encodeURIComponent(element.id)})}});), 
+      @generator.drop_receiving('blah', :url => { :action => "order" })
+  end
-end