Browse Source

Add each loops to eruby, general cleanups

master
jimi 14 years ago
parent
commit
9599617b49
  1. 31
      ftplugin/eruby/eruby.xpt.vim
  2. 2
      ftplugin/ruby/ruby.xpt.vim

31
ftplugin/eruby/eruby.xpt.vim

@ -4,6 +4,12 @@ XPTemplate priority=personal+
XPTvar $img_path 'images' XPTvar $img_path 'images'
XPT each " <% object.each do |arg, arg|...
XSET cursor=Echo('')
<% `obj^.each do |`arg*^| -%>
`cursor^
`:end:^
XPT end " <% end -%> XPT end " <% end -%>
<% end -%> <% end -%>
@ -36,15 +42,20 @@ XPT ifl " <% if flash[...
<div id="`notice^"><%= flash[:`notice^] %></div> <div id="`notice^"><%= flash[:`notice^] %></div>
`:end:^ `:end:^
XPT flash.each synonym=flea " <% flash.each do |args...
XSET cursor=Echo('')
<% flash.each do |key, value| -%>
<div class="flash <%= key %>"><%= value %></div>
`:end:^
XPT it hidden " embed-able image tag XPT it hidden " embed-able image tag
XSET image_path=$img_path/ XSET image_path=$img_path/
image_tag("`image_path^`image_file^"`, `opt?^)
image_tag('`image_path^`image_file^'`, `opt?^)
XPT image_tag synonym=imt " <%= image_tag... XPT image_tag synonym=imt " <%= image_tag...
<%= `:it:^ %> <%= `:it:^ %>
XPT link_to synonym=lt|lit " <%= link_to... XPT link_to synonym=lt|lit " <%= link_to...
XSET link='`link_text^'
XSET target=Echo('') XSET target=Echo('')
<%= link_to `link^, `target^ %> <%= link_to `link^, `target^ %>
@ -58,15 +69,15 @@ XPT enav synonym=nave,nav5
`:nav({ ':lia:' : ':lta:' }):^ `:nav({ ':lia:' : ':lta:' }):^
XPT form_for synonym=ff " <% form_for @model do... XPT form_for synonym=ff " <% form_for @model do...
<% form_for `@obj^ do |`f^| -%>
<%= form_for `@obj^ do |`f^| %>
` `cursor^ ` `cursor^
`:end:^ `:end:^
XPT flabel " <%= f.label... XPT flabel " <%= f.label...
<%= `f^.label `:object^, '`label^' %>
<%= `f^.label `object^`, '`label`'^ %>
XPT ftxt " <%= f.text_field... XPT ftxt " <%= f.text_field...
<%= `f^.text_field `:object^ %>
<%= `f^.text_field `object^ %>
XPT ftxa " <%= f.text_area... XPT ftxa " <%= f.text_area...
<%= `f^.text_area `object^ %> <%= `f^.text_area `object^ %>
@ -92,12 +103,16 @@ XPT ffile " <% f.file_field...
XPT fsubmit " <%= f.submit... XPT fsubmit " <%= f.submit...
<%= `f^.submit '`label^' %> <%= `f^.submit '`label^' %>
XPT render_partial synonym=rp " <%= render :partial...
XPT render " <%= render ...
XSET name=Echo('')
<%= render '`name^' -%>
XPT render_partial synonym=rp,partial " <%= render :partial...
XSET name=Echo('') XSET name=Echo('')
<%= render :partial => "`name^" %>
<%= render :partial => '`name^' -%>
XPT submit_tag " <%= submit_tag... XPT submit_tag " <%= submit_tag...
<%= submit_tag "`label^" %>
<%= submit_tag '`label^' %>
XPT stylesheet_link_tag synonym=slt " <%= stylesheet_link_tag... XPT stylesheet_link_tag synonym=slt " <%= stylesheet_link_tag...
<%= stylesheet_link_tag `^ %> <%= stylesheet_link_tag `^ %>

2
ftplugin/ruby/ruby.xpt.vim

@ -20,7 +20,7 @@ XPT :cols synonym=:rows|:size|:maxsize|:null|:url " $_xSnipName => val
XPT :object synonym=:collection|:locals|:layout|:method " $_xSnipName => val XPT :object synonym=:collection|:locals|:layout|:method " $_xSnipName => val
`:key:^ `:key:^
XPT :id synonym=:class|:alt|:title|:action|:controller " $_xSnipName => 'val'
XPT :id synonym=:class|:alt|:title|:action|:controller|:to " $_xSnipName => 'val'
XSET str='`val^' XSET str='`val^'
`:key({ 'val' : 'str' }):^ `:key({ 'val' : 'str' }):^