Changeset 1085
- Timestamp:
- 2008-07-01 01:58:29 (6 months ago)
- Files:
-
- trunk/lib/parser/lib/parser.rb (modified) (1 diff)
- trunk/test/helpers/zena_parser/ajax.yml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/parser/lib/parser.rb
r1082 r1085 513 513 new_context = @context.merge(acontext) 514 514 515 if ignore = acontext[:ignore] 516 ignore = (@context[:ignore] || []) + (acontext[:ignore] || []) 517 ignore.uniq! 518 if acontext[:no_ignore] 519 ignore = ignore - acontext[:no_ignore] 520 end 521 new_context[:ignore] = ignore 522 end 515 if acontext[:ignore] 516 new_context[:ignore] = (@context[:ignore] || []) + (acontext[:ignore] || []).uniq 517 end 518 519 if acontext[:no_ignore] 520 new_context[:ignore] = (new_context[:ignore] || []) - acontext[:no_ignore] 521 end 522 523 ignore = new_context[:ignore] 523 524 524 525 blocks.each do |b| trunk/test/helpers/zena_parser/ajax.yml
r1084 r1085 35 35 node: 'wiki' 36 36 src: | 37 < r:children>37 <ol do='children'> 38 38 <li do='each' do='[name]'>blah</li> 39 39 <li do='add'>add new</li> 40 40 <li do='form'><input name='v_title'/> this is the form</li> 41 </ol> 42 res: "/<li.*list1_30.*>bird.*<li.*list1_31.*>flower.*<li.*list1_add.*list1_form.*toggle.*<li .*list1_form.*style.*none.*Ajax.Request.*input type='hidden' name='t_url' value=./each/add/with/form/list1.*input type='hidden' name='node\[parent_id\]' value=.29./" 43 44 each_add_with_form_in_sub_block: 45 context: 46 node: 'wiki' 47 src: | 48 <r:children> 49 <ol do='void' name='boo'> 50 <li do='each' do='[name]'>blah</li> 51 <li do='add'>add new</li> 52 <li do='form'><input name='v_title'/> this is the form</li> 53 </ol> 41 54 </r:children> 42 res: " /<li.*list1_30.*>bird.*<li.*list1_31.*>flower.*<li.*list1_add.*list1_form.*toggle.*<li .*list1_form.*style.*none.*Ajax.Request.*input type='hidden' name='t_url' value=./each/add/with/form/list1.*input type='hidden' name='node\[parent_id\]' value=.29./"55 res: "!/<form.*<form/" 43 56 44 57 each_add_with_form_klass_set:
