zena 1.2.1 → 1.2.2

data/public/javascripts/window.js

@@ -1227,7 +1227,7 @@ var Windows = {
   modalWindows: [],
   observers: [],
   focusedWindow: null,
-  maxZIndex: 0,
+  maxZIndex: 100,
   overlayShowEffectOptions: {duration: 0.5},
   overlayHideEffectOptions: {duration: 0.5},
 

data/public/javascripts/zena.js

@@ -30,7 +30,7 @@ Zena.open_window = function(url, id, event, pos_x, pos_y) {
   }
                                                    // edit window, not in an iframe
   if (event && (event == true || event.shiftKey || (window == window.parent && window.current_sel))) {
-    var popup = window.open(url, name, 'location=0,width=300,height=400,resizable=1');
+    var popup = window.open(url, id, 'location=0,width=300,height=400,resizable=1');
     if (pos_x && pos_y) {
       popup.moveTo(pos_x, pos_y);
     } else {
@@ -59,13 +59,8 @@ Zena.open_window = function(url, id, event, pos_x, pos_y) {
           pos_y = 0;
         }
       } else {
-        if (Zena.window_offset) {
-          Zena.window_offset = Zena.window_offset + 15;
-        } else {
-          Zena.window_offset = 15;
-        }
-        pos_x = Zena.window_offset;
-        pos_y = Zena.window_offset;
+        pos_x = event.x - 12;
+        pos_y = event.y - 12;
       }
 
       var win = new Window({
@@ -93,7 +88,13 @@ Zena.open_window = function(url, id, event, pos_x, pos_y) {
 Zena.editor_preview = function(url, element, value) {
   var key = element.name;
   var full_url = url + '?key=' + key.slice(5, key.length - 1);
-  new Ajax.Request(full_url, {method:'get', asynchronous:true, evalScripts:true, parameters:{content: value }});
+  new Ajax.Request(full_url, {
+    // value too large for get.
+    method:'post',
+    asynchronous:true,
+    evalScripts:true,
+    parameters:{content: value}
+  });
 }
 
 // preview version.
@@ -654,11 +655,7 @@ Zena.popup_keydown = function(evt) {
   var gallery = Zena.popup_gallery;
 
 	var code = evt.keyCode;
-	//if (!e) var e = window.event;
-	//if (e.keyCode) code = e.keyCode;
-	//else if (e.which) code = e.which;
 	var character = String.fromCharCode(code);
-	//alert('Character was ' + character);
 
   if (code == Event.KEY_LEFT) {
     if (gallery.prev) {
@@ -720,7 +717,6 @@ Zena.popup = function(elem) {
       Event.observe(document.body, 'keydown', function(e) {
     	  var evt = e || window.event;
     	  $('pg_info').innerHTML = evt.keyCode;
-        //alert('key :' + evt.keyCode);
       });
     }
     if (!this.popup_gallery || this.popup_gallery.klass != config.klass) {
@@ -875,7 +871,8 @@ Zena.toggle = function(elem, definition, id) {
       onSuccess: function() {
         definition['list'] = definition['list'].without(id);
         Zena.set_toggle(elem.id, definition);
-      }
+        if (definition['js']) definition['js'](elem);
+      }  
     });
   } else {
     // turn on
@@ -885,8 +882,21 @@ Zena.toggle = function(elem, definition, id) {
       evalScripts:true,
       parameters: 'node[' + definition['role'] + '_id]=' + id,
       onSuccess: function() {
+        if (definition['arity'] == 'one') {
+          // uncheck all
+          definition['list'] = {};
+          // search for siblings
+          elem.siblings().each(function(s) {
+            try {
+              s.select('input.cb')[0].checked = false;
+              s.removeClassName('on');
+              s.addClassName('off');
+            } catch (err) {}
+          });
+        }
         definition['list'].push(id);
         Zena.set_toggle(elem.id, definition);
+        if (definition['js']) definition['js'](elem);
       }
     });
   }
@@ -904,8 +914,8 @@ Zena.m_toggle = function(id) {
 
 var pm_counter = 1;
 Zena.plus_minus = function(elem, start, plus, minus) {
-  plus  = plus  == undefined ? '[+]' : plus;
-  minus = minus == undefined ? '[-]' : minus;
+  var plus  = plus  == undefined ? '[+]' : plus;
+  var minus = minus == undefined ? '[-]' : minus;
 
   var tag = elem.tagName;
   pm_counter = pm_counter + 1;
@@ -913,12 +923,15 @@ Zena.plus_minus = function(elem, start, plus, minus) {
   var show = start == 'on' ? 'display:none;' : '';
   var hide = start == 'on' ? '' : 'display:none;';
   var trigger_tag = " <a id='off_"+id+"' style='"+show+"' onclick='Zena.m_toggle(\"" + id +"\")' class='plus_btn'>"+plus+"</a><a id='on_"+id+"' style='"+hide+"' onclick='Zena.m_toggle(\"" + id +"\")' class='minus_btn'>"+minus+"</a>";
-  var new_tag = "<"+tag+" style='"+hide+"' id='txt_"+id+"' class='txt" + ' ' + elem.className + "'>" + elem.innerHTML + "</"+tag+">";
   if (tag.toUpperCase() == 'SPAN' || !elem.previous()) {
-    Element.replace(elem, trigger_tag + ' ' + new_tag);
+    Element.insert(elem, {before:trigger_tag});
   } else {
     Element.insert(elem.previous(), {bottom:trigger_tag});
-    Element.replace(elem, new_tag);
+  }
+  elem.addClassName('txt')
+  elem.id = 'txt_'+id
+  if (start != 'on') {
+    elem.setStyle({display:'none'})
   }
 }
 
@@ -954,4 +967,100 @@ Zena.insert_inner = function(dom, position, content) {
   var insertions = {};
   insertions[position] = d.childElements()[0].innerHTML;
   Element.insert(dom, insertions);
-}
+}
+
+Zena.prepare_query = function(data, base, res) {
+  var res = res || {}
+  // transform {node:{a:'b'}} into {'node[a]':'b'}
+  $H(data).each(function(pair) {
+    var key = pair.key
+    var val = pair.value
+    if (base) {
+      key = base+'['+key+']'
+    }
+    if (typeof(val) == 'object') {
+      Zena.prepare_query(val, key, res)
+    } else {
+      res[key] = val
+    }
+  })
+  return res
+}
+
+Zena.do = function(method, dom, query) {
+  var dom = $(dom)
+
+  var zip
+  if (typeof(query) == 'string') {
+    query = {id:query}
+  }
+  if (query.id) {
+    zip = query.id
+    delete query.id
+  } else {
+    zip = dom.getAttribute('data-z')
+  }
+
+  var url
+  if (method == 'get') {
+    url = '/nodes/' + zip + '/zafu'
+  } else if (method == 'post') {
+    url = '/nodes'
+  } else {
+    // put
+    url = '/nodes/' + zip
+  }
+
+  if (Object.prototype.toString.apply(query) === '[object Array]') {
+    var list = query
+    var todo = list.length
+    for (var i=0; i < list.length; i++) {
+      new Ajax.Request(url, {
+        method:method,
+        parameters:Zena.prepare_query(list[i]),
+        asynchronous:true,
+        onSuccess: function() {
+          todo--;
+          if (todo == 0) {
+            Zena.reload(dom)
+          }
+        },
+        onFailure: function() {
+          alert("Could not "+method+" "+Object.toJSON(query))
+        }
+      });
+    }
+  } else {
+    query.dom_id = dom.id
+    if (!query.s) query.s = $(document.body).getAttribute('data-z')
+    if (!query.t_url) query.t_url = $(document.body).getAttribute('data-t') + '/' + (dom.getAttribute('data-t') || dom.id)
+    new Ajax.Request(url, {
+      method:method,
+      parameters:Zena.prepare_query(query),
+      asynchronous:true,
+      evalScripts:true,
+    });
+  }
+}
+
+Zena.get = function(dom_name, query) {
+  Zena.do('get', dom_name, query || {});
+  return false;
+}
+Zena.reload = Zena.get;
+
+Zena.put = function(dom_name, query) {
+  Zena.do('put', dom_name, query || {});
+  return false;
+}
+
+Zena.post = function(dom_name, query) {
+  Zena.do('post', dom_name, query || {});
+  return false;
+}
+
+Zena.loading = function(e) {
+  e.addClassName('zloading')
+}
+
+

data/public/stylesheets/grid.css

@@ -2,9 +2,12 @@
 .grid tr.action td {border-width:0 0 1px 0; font-size:70%}
 .grid tr.action td.action {border:0}
 .grid td.input, .grid th.input { padding:0;}
-.grid td.input input, .grid th.input input { margin:0; padding:0;font-size:inherit;}
-.grid td.changed {background:#E5DDD7}
+.grid .input input, .grid .input textarea { margin:0; padding:0;font-size:inherit;}
+.grid td.changed, .grid .new td.changed {background:#E5DDD7}
+.grid .new td {background:#B2DFEE}
+.grid .new td.action {background:none}
 .grid .saved { background:#A3FF4F}
+.grid td.error, .grid tr.error td { background:#FFB6C1; border-color:red}
 .grid td.undone, .grid td.changed.undone, .grid th.undone, .grid th.changed.undone { background:#F3F07F}
 .grid .action span {cursor:pointer; visibility:hidden;}
 .grid:hover .action span {visibility:visible;}
@@ -16,4 +19,10 @@
 .grid_btn {margin:1em 0}
 .grid_btn a.save {background:#80B62D}
 .grid_btn a.undo {background:#AAB76D}
+.grid_msg {border:1px solid #888; background:#eee; border-radius:4px; padding:5px; display:table}
 
+.tags li {border-radius:2px; background:#ccc url('/images/remove_tag.png') no-repeat; padding:2px 5px 2px 15px; margin:3px; display:inline; background-position:2px 4px}
+.tags li.add {background:#8c8 url('/images/add.png') no-repeat;background-position:1px 2px}
+
+.grid .asc  {background:#7b7}
+.grid .desc {background:#fa0}

data/public/stylesheets/zena.css

@@ -59,7 +59,7 @@ table.errors td { padding:2px 5px; background:inherit; border:none;}
 
 /* dev */
 .devb, #dev { background:#eee; font-size:10px;
-padding:5px; border:2px solid #222; text-align:left; color:#444; z-index:9999; border-width:2px 0 0 2px;}
+padding:5px; border:2px solid #222; text-align:left; color:#444; z-index:100; border-width:2px 0 0 2px;}
 #dev { position:fixed; bottom:0px; right:0px;}
 .devb a { color:inherit; }
 .devb ul, .devb li { margin:0; padding:0; list-style:none; background:none; list-style-image:none;}
@@ -87,3 +87,4 @@ ins.differ, ins.differ * { background:#cfc; text-decoration:none; padding:1px 2p
 #pg_info a { width:100px; height:40px;}
 #pg_next {position:absolute; right:0; background:url('/images/popup_next.png?1276089554') no-repeat right top;}
 #pg_prev {position:absolute; left:0; background:url('/images/popup_prev.png?1276089554') no-repeat left top;}
+.zloading {opacity:0.4}

data/test/custom_queries/complex.host.yml

@@ -63,7 +63,12 @@ Node:
       - courses.custom_a AS repeat_every
       - form.last_date AS last_date
       - form.last_date + INTERVAL courses.custom_a MONTH AS next_date
+      # Current hack to properly cast values to Time during read
+      - form.last_date + INTERVAL courses.custom_a MONTH AS idx_datetime1
       - MAX(IF(assigned_pages.custom_a,assigned_pages.custom_a,5)) AS priority
+    types:
+      next_date: time
+      last_date: time
     tables:
       - nodes AS courses
       # assigned to

data/test/fixtures/files/TestNode.zafu

@@ -63,6 +63,16 @@
     </table>
   </div>
 
+  <div class='test' id='destroy1' do='selenium'>
+    <h3>destroy1</h3>
+    <p>Using "action='destroy'" to remove elements.</p>
+    <ul id='destroy_list' do='block' do='projects in site'>
+      <li do='add' klass='Project' after='self'/>
+      <li do='form'><r:input name='title'/></li>
+      <li class='#{title}' do='each'><r:link/> <span id='destroy_#{title}' do='link' action='destroy' update='destroy_list' do='t'>destroy</span></li>
+    </ul>
+  </div>
+
   <div class='test' id='edit1' do='selenium'>
     <h3>edit1</h3>
     <p>Edit in place, form built from block.</p>
@@ -162,6 +172,18 @@
     </ul>
   </div>
 
+  //! toggle2
+  <div class='test' id='toggle2' do='selenium'>
+    <h3>toggle2</h3>
+    <p>Toggle with js. <span id='toggle2_count' do='block'>toggle2_count=<r:references find='count'/></span></p>
+    <ul class='references' do='references'>
+      <li do='each' do='title'/>
+    </ul>
+    <ul do='projects in site'>
+      <li do='each' toggle='reference' for='start' js='Zena.reload("toggle2_count")' do='title'/>
+    </ul>
+  </div>
+
   <div class='test' id='paginate1' do='selenium'>
     <h3>paginate1</h3>
     <p>Ajax pagination.</p>
@@ -240,6 +262,20 @@
     </r:form>
   </div>
 
+  //! form4
+  <div class='test' id='form4' do='selenium'>
+    <h3>form4</h3>
+    <p>Form to update hash property.</p>
+	<p id='form4_one' do='settings["one"]'/>
+	<p id='form4_two' do='settings["two"]'/>
+    <r:form node[v_status]='50'>
+      <ul>
+        <li><r:input label='t' name='settings[two]'/></li>
+        <li><r:input type='submit'/></li>
+      </ul>
+    </r:form>
+  </div>
+
   <div class='test' id='drop1' do='selenium'>
     <h3>drop1</h3>
     <p>Create a relation by drag and dropping.</p>

data/test/functional/nodes_controller_test.rb

@@ -376,7 +376,6 @@ class NodesControllerTest < Zena::Controller::TestCase
         end
       end # by changing a link comment
 
-
       context 'by changing a link date' do
         subject do
           {:action => 'update', :controller => 'nodes', :id => nodes_zip(:opening), :node => {:link_id => links_id(:opening_in_art), :l_date => '2011-03-29 17:51'}}
@@ -416,7 +415,25 @@ class NodesControllerTest < Zena::Controller::TestCase
         end # with a bad value
 
       end # by changing skin
+      
+      context 'by changing a hash value' do
+        setup do
+          Column.create(:role_id => roles_id(:Task), :ptype => 'hash', :name => 'foo')
+        end
+        
+        subject do
+          {:action => 'update', :controller => 'nodes', :id => nodes_zip(:people), :node => {:foo => {:bar => 'hello'}}}
+        end
 
+        should 'change parameter' do
+          put_subject
+          node = secure(Node) { nodes(:people) }
+          foo = node.foo
+          assert_equal 'hello', foo['bar']
+          # Should not raise cast error
+          assert node.update_attributes('title' => 'pep')
+        end
+      end
     end # updating a node
 
     # ======================================= Template update

data/test/integration/zafu_compiler/action.yml

@@ -69,7 +69,7 @@ action:
 swap:
   src: "<span do='block' do='swap' attr='weight' states='100,-100' do='weight'/>"
   tem: '/:dom_id => %Q\{list1\}, :t_url => "action/swap/list1"/'
-  '/action/swap/en/list1.erb': "/<span id='<%= ndom_id\(@node\) %>'>/"
+  '/action/swap/en/list1.erb': "/<span .*id='<%= ndom_id\(@node\) %>'/"
 
 swap_with_params:
   src: "<span do='block' do='swap' node[origin]='%{me}' attr='weight' states='100,-100' do='weight'/>"
@@ -86,7 +86,7 @@ swap_in_each:
 
 swap_in_each_with_block:
   src: "<r:pages in='site limit 2'><li do='each'><p do='block'><span do='swap' publish='true' attr='origin' states='todo,done,alert'/></p></li></r:pages>"
-  res: "/<p id='list2_29'>.*list2_29.*<p id='list2_33'>.*list2_33/"
+  res: "/<p .*id='list2_29'.*>.*list2_29.*<p .*id='list2_33'.*>.*list2_33/"
 
 hand_made_swap:
   src: "<r:link update='_page' node[origin]='next_in_list(origin, \"todo,done\")' action='update'/>"

data/test/integration/zafu_compiler/ajax.yml

@@ -6,13 +6,13 @@ default:
 
 block:
   src: "<r:parent><r:block name='foobar' do='title'/></r:parent>"
-  tem: "<% if var1 = @node.parent %><div id='foobar'><%= var1.prop['title'] %></div><% end %>"
-  'ajax/block/en/foobar.erb': "<div id='<%= ndom_id(@node) %>'><%= @node.prop['title'] %></div>"
+  tem: "<% if var1 = @node.parent %><div id='foobar' data-z='<%= var1.zip %>'><%= var1.prop['title'] %></div><% end %>"
+  'ajax/block/en/foobar.erb': "<div id='<%= ndom_id(@node) %>' data-z='<%= @node.zip %>'><%= @node.prop['title'] %></div>"
 
 add:
   src: "<ul id='children' do='nodes'><li do='each' do='link'/><li do='add'/></ul>"
   tem: "/\[\"children_add\", \"children_0\"\].each\(Element.toggle\)/"
-  'ajax/add/en/children_form.erb': "/class='form' id='<%= ndom_id\(@node\) %>'/"
+  'ajax/add/en/children_form.erb': "/class='form' .*id='<%= ndom_id\(@node\) %>'/"
   'ajax/add/en/children.erb': "<li id='<%= ndom_id(@node) %>'><a href='<%= zen_path(@node) %>'><%= @node.prop['title'] %></a></li>"
 
 edit_not_each:
@@ -24,6 +24,12 @@ edit_in_block:
   res: "/Ajax.Request\(\"/nodes/22/zafu\?dom_id=list1&"
   'ajax/edit/in/block/en/list1_form.erb': "/f.text_field :title.*alt='cancel/"
 
+block_in_block:
+  src: "<div do='block' name='a'>A:<r:root do='link' update='a'/><r:filter live='true' update='b'/><div do='block' name='b'>B:</div></div>"
+  # Make sure the correct template is built, not a2 or something.
+  'ajax/block/in/block/en/a.erb': "/A:/"
+  'ajax/block/in/block/en/b.erb': "/B:/"
+
 edit_in_block_publish:
   src: "<li do='block'><r:title/> <r:edit publish='true'/></li>"
   res: "/Ajax.Request\(\"/nodes/22/zafu\?dom_id=list1/"
@@ -55,7 +61,7 @@ form_update:
 add_each_no_form:
   src: "<ul do='children' id='things'><li do='each'>I <p do='title'>blah</p></li><li do='add'/></ul>"
   tem: "!/</ul><ul></ul>/" # bug in closing group with [add].
-  res: "/<ul><li.*id='things_add'.*li.*class='form' id='things_0'.*form.*I <p><input id=.things_title. name=.node\[title\]. .*type=.text..*hidden/"
+  res: "/<ul><li.*id='things_add'.*li.*class='form' .*id='things_0'.*form.*I <p><input id=.things_title. name=.node\[title\]. .*type=.text..*hidden/"
 
 add_each_no_form_date:
   src: "<ul do='children' id='things'><li do='each'>I <p do='show' attr='event_at' tformat='short_date'>blah</p></li><li do='add'/></ul>"
@@ -74,7 +80,7 @@ each_add_with_form:
       <li do='add'>add new</li>
       <li do='form'><input name='title'/> this is the form</li>
     </ol>
-  res: "/<li id='list1_30'>bird.*<li id='list1_31'>flower.*<li.*list1_add.*list1_0.*toggle.*<li style.*none.*list1_0.*Ajax.Request.*input type='hidden' name='t_url' value=.ajax/each/add/with/form/list1.*input type='hidden' name='node\[parent_id\]' value=.29./"
+  res: "/<li id='list1_30'>bird.*<li id='list1_31'>flower.*<li.*list1_add.*list1_0.*toggle.*<li.*style.*none.*list1_0.*Ajax.Request.*input type='hidden' name='t_url' value=.ajax/each/add/with/form/list1.*input type='hidden' name='node\[parent_id\]' value=.29./"
 
 each_add_with_form_in_sub_block:
   context:
@@ -177,24 +183,24 @@ live_filter:
   src: "<r:filter live='true'/><r:block><ol do='pages where title like \"#{params[:f]}%\"'><li do='each' do='title'/></ol></r:block>"
   # Make sure a unique_name is set for the given block
   tem: "/name='t_url' value='ajax/live/filter/list1'.*<% filter_form\(@node.*ml1.value LIKE \?.*, \"#\{params\[:f\]\}%\"/"
-  'ajax/live/filter/en/list1.erb': "/<div id='<%= ndom_id\(@node\).*, \"#\{params\[:f\]\}%\".*var2.prop\['title'\]/"
-  res: "/<input type='text' name='f'.*<div id='list1'><ol><li>crocodiles</li><li>status title</li></ol></div>/"
+  'ajax/live/filter/en/list1.erb': "/<div .*id='<%= ndom_id\(@node\).*, \"#\{params\[:f\]\}%\".*var2.prop\['title'\]/"
+  res: "/<input type='text' name='f'.*<div .*id='list1'.*><ol><li>crocodiles</li><li>status title</li></ol></div>/"
 
 live_filter_single_element:
   context:
     node: cleanWater
   src: "<r:filter live='true'/><r:block><r:page where='title like \"#{params[:f]}%\"' find='first'><b do='title'/></r:page></r:block>"
   tem: "/, \"#\{params\[:f\]\}%\"/"
-  'ajax/live/filter/single/element/en/list1.erb': "/<div id=.*params\[:f\].*var1.prop\['title'\]/"
-  res: "/<input type='text' name='f'.*<div id='list1'><b>crocodiles</b></div>/"
+  'ajax/live/filter/single/element/en/list1.erb': "/<div .*id=.*params\[:f\].*var1.prop\['title'\]/"
+  res: "/<input type='text' name='f'.*<div .*id='list1'.*><b>crocodiles</b></div>/"
 
 live_filter_select_options:
   context:
     node: cleanWater
   src: "<r:filter live='true' do='select' param='f' tprefix='foo' values='1,2'/><r:block><ol do='pages where title like \"#{params[:f]}%\"'><li do='each' do='title'/></ol></r:block>"
   tem: "/select name=.f.><%= options_for_select.*.foo_1., .1..*, param_value\(.f.\).to_s/"
-  'ajax/live/filter/select/options/en/list1.erb': "/<div id='<%= ndom_id\(@node\) %>'.*params\[:f\]/"
-  res: "/<select name='f'.*<div id='list1'><ol><li>crocodiles</li><li>status title</li></ol></div>/"
+  'ajax/live/filter/select/options/en/list1.erb': "/<div .*id='<%= ndom_id\(@node\) %>'.*params\[:f\]/"
+  res: "/<select name='f'.*<div .*id='list1'.*><ol><li>crocodiles</li><li>status title</li></ol></div>/"
 
 draggable_do_syntax:
   src: "<r:images in='site' do='each' draggable='all' do='img' mode='pv'/>"
@@ -220,7 +226,7 @@ drag_with_form:
         <td class='edit'> <r:edit class='edit'>éditer</r:edit></td>
       </tr>
     </table>"
-  tem: "/<span class='drag' id='<%= %Q\{list3_#\{var2.zip\}\}.*<% add_drag_id\(%Q\{list3_#\{var2.zip\}\}/"
+  tem: "/<span class='drag' id='<%= %Q\{list2_#\{var2.zip\}\}.*<% add_drag_id\(%Q\{list2_#\{var2.zip\}\}/"
 
 drag_with_form_not_in_form:
   src: "<table do='pages in site'>
@@ -255,7 +261,7 @@ draggable_in_block:
   # should use 'hooba' class
   src: "<r:block><r:link draggable='hooba'/></r:block>"
   tem: "/add_drag_id\(%Q\{drag_\#\{@node.zip\}\}, .*hooba/"
-  res: "<div id='list1'><span class='drag' id='drag_22'><span class='hooba'>&nbsp;</span><a href='/oo/projects-list/Clean-Water-project/page22.html'>status title</a></span></div>"
+  res: "<div id='list1' data-z='22'><span class='drag' id='drag_22'><span class='hooba'>&nbsp;</span><a href='/oo/projects-list/Clean-Water-project/page22.html'>status title</a></span></div>"
   js:  "/Zena.draggable\(item, \"hooba\"\)/"
 
 draggable_with_id_set:
@@ -290,8 +296,8 @@ edit_link:
   'ajax/edit/link/fr/list1.erb': "/:link_id => @node.link_id/"
 
 start_id:
-  src: "<r:form><input type='hidden' name='s' value='#{start_id}'/></r:form>"
-  res: "/<input type='hidden' name='s' value='22'/></"
+  src: "<r:form><input name='s' type='hidden' value='#{start_id}'/></r:form>"
+  res: "/<input name='s' type='hidden' value='22'/></"
 
 drop_add_link:
   context:
@@ -299,7 +305,7 @@ drop_add_link:
   src: "<div do='drop' add='favorite'></div>"
   # without the ugly inspect, this would be '#{id}' or "\#{id}"
   tem: "/drop_node_path.*\"node\[favorite_id\]\" => \"\\\\#\{id\}\"/"
-  res: "<div class='drop' id='list1'></div>"
+  res: "<div class='drop' id='list1' data-z='22'></div>"
   js: "/Droppables.add\('list1'.*/nodes/22/drop.*node\[favorite_id\]=%23%7Bid%7D"
 
 drop_var_scope:
@@ -312,14 +318,14 @@ drop_done_remove:
 
 drop_param:
   src: "<r:drop change='params' d='%{foo}'>params[:d] = <r:show eval='params[:d]'/></r:drop>"
-  tem: "/<div class='drop' id='list1'><% add_drop_id\(%Q\{list1\}, :url => drop_node_path\(@node.*:d => \"foo\", :change => \"params\"/"
-  res: "<div class='drop' id='list1'>params[:d] = </div>"
+  tem: "/<div class='drop' id='list1'.*><% add_drop_id\(%Q\{list1\}, :url => drop_node_path\(@node.*:d => \"foo\", :change => \"params\"/"
+  res: "<div class='drop' id='list1' data-z='22'>params[:d] = </div>"
   js: '/Droppables.add\(.list1.*d=foo/'
 
 drop_in_each:
   src: "<ul do='pages'><li do='each'><ul do='drop' set='reference'>...</ul></li></ul>"
-  tem: "/<ul class='drop' id='<%= %Q\{list2_#\{var2.zip\}\} %>'><% add_drop_id\(%Q\{list2_#\{var2.zip\}\}/"
-  'ajax/drop/in/each/en/list2.erb': "/<ul class='drop' id=.*ndom_id.*add_drop_id.*drop_node_path.*ndom_id/"
+  tem: "/<ul class='drop' .*id='<%= %Q\{list2_#\{var2.zip\}\} %>'.*><% add_drop_id\(%Q\{list2_#\{var2.zip\}\}/"
+  'ajax/drop/in/each/en/list2.erb': "/<ul class='drop' .*id=.*ndom_id.*add_drop_id.*drop_node_path.*ndom_id/"
 
 drop_param_in_each:
   src: "<r:pages do='each' do='drop' change='params' d='%{foo}'><r:show eval='params[:d]'/></r:pages>"
@@ -341,13 +347,15 @@ drop_in_each_id:
   # Should use prefix from "drop", not list of favorites.
   res: "/drop13_39/"
   # Show drop element
-  'ajax/drop/in/each/id/en/drop12.erb': "/^\s*<ul.*<li id='<%= %Q\{drop13_#\{var2.zip\}\} %>"
+  'ajax/drop/in/each/id/en/drop12.erb': "/^\s*<ul.*<li .*id='<%= %Q\{drop13_#\{var2.zip\}\} %>"
   # Show each element
   'ajax/drop/in/each/id/en/drop13.erb': '/^\s*<li/'
 
 update_target:
   src: "UT: <div id='foo' do='block'>...</div> <r:link update='foo'/>"
-  tem: "/UT: <div id='foo'>...</div> .*Ajax.Request.*:dom_id => %Q\{foo\}/"
+  tem: "/UT: <div .*id='foo'.*>...</div> .*Ajax.Request.*:dom_id => %Q\{foo\}/"
+  # New syntax should be
+  # tem: "/UT: <div .*id='foo'>...</div> .*Zena.get('foo', {id:<%= @node.zip %>})/"
 
 update_target_encode_params:
   context:
@@ -358,11 +366,11 @@ update_target_encode_params:
 
 include_update_target:
   src: "IUT: <r:include template='/ajax/update/target'><r:with part='foo'><r:show attr='title'/></r:with></r:include>"
-  tem: "/IUT: UT: <div id='foo'><%= h @node.prop\['title'\] %></div> <a .*zen_path.*onclick='new Ajax.Request/"
+  tem: "/IUT: UT: <div .*id='foo'.*><%= h @node.prop\['title'\] %></div> <a .*zen_path.*onclick='new Ajax.Request/"
 
 id_in_each_group_should_be_scoped:
   src: "<ul do='comments from nodes in site' do='group' by='discussion_id'><li do='each'><r:node do='block' do='title'/></li></ul>"
-  tem: "/<div id='<%= %Q\{list1_#\{var4.zip\}_list2\} %>'>/"
+  tem: "/<div .*id='<%= %Q\{list1_#\{var4.zip\}_list2\} %>'/"
 
 link_page_next:
   context:
@@ -380,7 +388,7 @@ link_page_list:
 toggle:
   src: "<span do='toggle' set='favorite' for='visitor.node'/>"
   res: "<span class='toggle' id='list1_22'></span>"
-  js: "/var1 = \{\"list\":\[39\], \"url\":\"/nodes/13\", \"role\":\"favorite\".*\"list1_22\"\].each.function.item. \{ Zena.set_toggle/"
+  js: "/var1 = \{list:\[39\], url:\"/nodes/13\", role:\"favorite\".*\"list1_22\"\].each.function.item. \{ Zena.set_toggle/"
 
 toggle_attribute_in_each:
   context:
@@ -394,7 +402,7 @@ toggle_dyn_attribute_in_each:
     node: cleanWater
     rel: favorite
   src: "<ul do='pages'><li do='each' toggle='#{params[:rel]}' for='visitor.node' do='title'/></ul>"
-  tem: "/add_toggle_id\(\"list1_#\{var2.zip\}\", \"var2_tog\", \"#\{params\[:rel\]\}\"\)/"
+  tem: "/add_toggle_id\(\"list1_#\{var2.zip\}\", \"var2_tog\", \"#\{params\[:rel\]\}\",\{\}\)/"
   res: "/<ul><li class='toggle' id='list1_26'>crocodiles</li>/"
   js: "/list1_26.*each/"
 
@@ -418,6 +426,16 @@ js_dyn:
   res: "x  y"
   js: "<script type=\"text/javascript\">\n//<![CDATA[\nalert('ho status title');\n//]]>\n</script>"
 
+js_less_then:
+  src: "x <r:js>if (i < 4) alert('ho <r:title/>');</r:js> y"
+  tem: "x <% js_data << capture do %>if (i < 4) alert('ho <%= @node.prop['title'] %>');<% end %> y"
+  res: "x  y"
+  js: "<script type=\"text/javascript\">\n//<![CDATA[\nif (i < 4) alert('ho status title');\n//]]>\n</script>"
+
+js_in_attr:
+  src: "<a onclick='if (i < 4) alert(\"go\");'>hop</a>"
+  tem: "<a onclick='if (i < 4) alert(\"go\");'>hop</a>"
+
 filter_in_list:
   # Should move to up node and not raise an error.
   src: "<ul do='pages in site'><r:block></r:block><li do='filter' live='true'/></ul>"