lib/orange/middleware/template.rb in orange-0.0.4 vs lib/orange/middleware/template.rb in orange-0.0.5
- old
+ new
@@ -10,10 +10,12 @@
# Establish a default template chooser
@core.template_chooser do |packet|
if packet['route.context'] == :admin
packet.add_css('admin.css', :module => '_orange_')
+ packet.add_js('jquery.js', :module => '_orange_')
+ packet.add_js('admin.js', :module => '_orange_')
'admin.haml'
else
false
end
end
@@ -23,12 +25,13 @@
packet['template.file'] = orange.template_for packet
status, headers, content = pass packet
if needs_wrapped?(packet)
content = wrap(packet, content)
packet[:content] = content.first
- end
- orange.fire(:wrapped, packet)
- [status, headers, packet.content]
+ orange.fire(:wrapped, packet)
+ end
+ orange.fire(:after_wrap, packet)
+ packet.finish
end
def needs_wrapped?(packet)
packet['template.file'] && !packet['template.disable']
end
\ No newline at end of file