Changeset 1119

Timestamp:

2008-07-25 10:01:05 (6 months ago)

Author:

gaspard

Message:

Fixed nasty bug (arghh hard to catch) where DOM ids would get messed up when using [link update='...'].

Files:

• trunk/app/helpers/application_helper.rb (modified) (2 diffs)
• trunk/lib/parser/lib/rules/zena.rb (modified) (5 diffs)

trunk/app/helpers/application_helper.rb

@@ -126 +126 @@
-    end
-                <<-EOL
-div class="date_box"><img src="/calendar/iconCalendar.gif" id="#{opts[:button]}"
+span class="date_box"><img src="/calendar/iconCalendar.gif" id="#{opts[:button]}" alt='#{_('date selection')}'
-#{fld}
-        <script type="text/javascript">
@@ -135 +135 @@
-        showsTime      :    true
-    });
-div
+span
-                EOL
-        end

trunk/lib/parser/lib/rules/zena.rb

@@ -864 +864 @@
-        @html_tag = 'input'
-        @html_tag_params[:type] = @params[:type]
-
+ if @params[:text]
-        @html_tag_params.merge!(html_attributes)
-        render_html_tag(nil)
@@ -899 +899 @@
-          id_hash[:style] = "display:none;"
-          
-span class='btn_x'><a href='#' onclick='[\"#{erb_dom_id}_add\", \"#{erb_dom_id}_form\"].each(Element.toggle);return false;'>#{_('btn_x')}</a></span
+p class='btn_x'><a href='#' onclick='[\"#{erb_dom_id}_add\", \"#{erb_dom_id}_form\"].each(Element.toggle);return false;'>#{_('btn_x')}</a></p
-          form  =  "<%= form_remote_tag(:url => #{base_class.to_s.underscore.pluralize}_path, :html => {:id => \"#{dom_id}_form_t\"}) %>\n"
-        else
@@ -908 +908 @@
-          cancel = <<-END_TXT
-<% if #{node}.new_record? -%>
-span class='btn_x'><a href='#' onclick='[\"<%= params[:dom_id] %>_add\", \"<%= params[:dom_id] %>_form\"].each(Element.toggle);return false;'>#{_('btn_x')}</a></span
+p class='btn_x'><a href='#' onclick='[\"<%= params[:dom_id] %>_add\", \"<%= params[:dom_id] %>_form\"].each(Element.toggle);return false;'>#{_('btn_x')}</a></p
-<% else -%>
-span class='btn_x'><%= link_to_remote(#{_('btn_x').inspect}, :url => #{base_class.to_s.underscore}_path(#{node_id}) + \"/zafu?t_url=#{CGI.escape(template_url)}&dom_id=\#{params[:dom_id]}#{@context[:need_link_id] ? "&link_id=\#{#{node}.link_id}" : ''}\", :method => :get) %></span
+p class='btn_x'><%= link_to_remote(#{_('btn_x').inspect}, :url => #{base_class.to_s.underscore}_path(#{node_id}) + \"/zafu?t_url=#{CGI.escape(template_url)}&dom_id=\#{params[:dom_id]}#{@context[:need_link_id] ? "&link_id=\#{#{node}.link_id}" : ''}\", :method => :get) %></p
-<% end -%>
-END_TXT
@@ -2282 +2282 @@
-    end
-    
-    def context_name
-      return (@context[:name] || 'list') if @context
-      @name || @params[:id] || parent ? parent.context_name : 'root'
-    end
-    
-    def context
-      return @context if @context
-      # not rendered yet, find first parent with context
-      @context = parent ? parent.context : {}
-    end
-    
-    # prefix for DOM id
-    def dom_prefix
-      (@context ? @context[:dom_prefix] : nil) || (@dom_prefix ||= unique_name)
-    end
-    
-    # use our own scope
-    def clear_dom_scope
-      @context.delete(:dom_prefix)     # should not propagate
-      @context.delete(:make_form)      # should not propagate
-      @context.delete(:saved_template) # should not propagate
-    end
-    
-    # create our own ajax DOM scope
-    def new_dom_scope
-      clear_dom_scope
-      @context[:dom_prefix] = self.dom_prefix
-    end
-    
-    # DOM id for the current context
-    def dom_id(suffix='')
@@ -2372 +2343 @@
-      template_url + '_form'
-    end
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    # Return a different name on each call
-    def unique_name
-      base = context_name
-      root.next_name_index(base, base == @name).gsub(/[^\d\w\/]/,'_')
+    end
+    
+    def context_name
+      return (@name || @context[:name] || 'list') if @context
+      @name || @params[:id] || (parent ? parent.context_name : 'root')
-    end
-