lib/nitro/mixin/xhtml.rb in nitro-0.23.0 vs lib/nitro/mixin/xhtml.rb in nitro-0.24.0
- old
+ new
@@ -88,11 +88,11 @@
%{
<select id="#{name}.day" name="#{name}.day">
#{options(:labels_values => (1..31).to_a, :selected => date.day)}
</select>
<select id="#{name}.month" name="#{name}.month">
- #{options(:labels => Date::MONTHNAMES, :values => (1..12).to_a, :selected => (date.month+1))}
+ #{options(:labels => Date::MONTHNAMES, :values => (1..12).to_a, :selected => (date.month))}
</select>
<select id="#{name}.year" name="#{name}.year">
#{options(:labels_values => ((Time.now.year-10)..(Time.now.year+10)).to_a, :selected => date.year)}
</select>}
end
@@ -127,10 +127,10 @@
:title => 'Popup',
:resizable => false,
:scrollbars => false,
}.merge(options)
- poptions = (o[:resizable] ? 'resizable=yes' : 'resizable=no')
+ poptions = (o[:resizable] ? 'resizable=yes,' : 'resizable=no,')
poptions << (o[:scrollbars] ? 'scrollbars=yes' : 'scrollbars=no')
url = o[:url] || o[:uri]
%[javascript: var pwl = (screen.width - #{o[:width]}) / 2; var pwt = (screen.height - #{o[:height]}) / 2; window.open('#{url}', '#{o[:title]}', 'width=#{o[:width]},height=#{o[:height]},top='+pwt+',left='+pwl+', #{poptions}'); return false;"]