zafu 0.7.2 → 0.7.3

data/History.txt

@@ -1,7 +1,8 @@
-== 0.7.2 2010-09-14
+== 0.7.3 2010-09-14
 
 * Minor enhancement
   * Better processing of nested arrays in node_context.
+  * Support to overwrite need_ajax? method
 
 == 0.7.1 2010-09-14
 
@@ -55,4 +56,4 @@
   * Compiles 'html' with rubyless declarations.
   * Guesses main ivar from view.
   * Tries to resolve method by adding current node parameter.
-  * Added basic conditional execution with 'else' and dummy 'if' clauses.
+  * Added basic conditional execution with 'else' and dummy 'if' clauses.

data/lib/zafu/info.rb

@@ -1,4 +1,4 @@
 module Zafu
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end
 

data/lib/zafu/process/ajax.rb

@@ -289,6 +289,7 @@ module Zafu
       def set_dom_prefix(node = self.node)
         @name ||= unique_name
         # TODO: should rebuild descendants list in parents...
+        #puts [parent.method, method, @context[:name], @name].inspect
         node.dom_prefix = @name
       end
 
@@ -321,6 +322,20 @@ module Zafu
         end
       end
 
+      protected
+
+        def need_ajax?(each_block)
+          return false unless each_block
+          # Inline editable
+          each_block.descendant('edit') ||
+          # Ajax add
+          descendant('add') ||
+          # List is reloaded from the 'add_document' popup
+          descendant('add_document') ||
+          # We use 'each' as block instead of the declared 'block' or 'drop'
+          ['block', 'drop'].include?(each_block.single_child_method)
+        end
+
       private
 
         # Find a block to update on the page
@@ -358,20 +373,6 @@ module Zafu
           out helper.save_erb_to_url(template, cont[:saved_template])
         end
 
-        def need_ajax?(each_block)
-          return false unless each_block
-          # Inline editable
-          each_block.descendant('edit') ||
-          # Ajax add
-          descendant('add') ||
-          # List is reloaded from the 'add_document' popup
-          descendant('add_document') ||
-          # We use 'each' as block to render swap
-          (descendant('swap') && descendant('swap').parent.method != 'block') ||
-          # We use 'each' as block instead of the declared 'block' or 'drop'
-          ['block', 'drop'].include?(each_block.single_child_method)
-        end
-
         #template = expand_block(self, :)
         #
         #if @context[:block] == self

data/lib/zafu/process/context.rb

@@ -35,18 +35,16 @@ module Zafu
           with_context(:node => node.move_to(var, node.klass.first, :query => node.opts[:query])) do
             # We pass the :query option for RubyLess resolution by using the QueryBuilder finder
 
+            steal_and_eval_html_params_for(@markup, @params)
             # The id set here should be used as prefix for sub-nodes to ensure uniqueness of generated DOM ids
             if node.list_context?
               # we are still in a list (example: previous context was [[Node]], current is [Node])
             else
               node.propagate_dom_scope!
-            end
-
-            steal_and_eval_html_params_for(@markup, @params)
 
-            if need_dom_id?
-              set_dom_prefix
-              @markup.set_id(node.dom_id)
+              if need_dom_id?
+                @markup.set_id(node.dom_id)
+              end
             end
 
             out wrap(expand_with)

data/zafu.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zafu}
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Gaspard Bucher