deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use AssetTagHelpers in S5 Template

Browse source 
Otherwise S5  breaks when Instiki is
deployed to a non-root URL (e.g., by
setting RailsBaseURI in Passenger).

Also a stylistic tweak in lib/node.rb
This commit is contained in:
Jacques Distler 2009-10-11 09:49:01 -05:00
parent dd8c912c6c
commit 23e9c6beb2
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/node.rb
View file

@ -308,7 +308,7 @@ module XHTML #:nodoc:
# Returns non-+nil+ if this tag can contain child nodes.
def childless?(xml = false)
return false if xml && @closing.nil?
return false if xml && @closing.nil?
# !@closing.nil? ||
@name =~ /^(img|br|hr|link|meta|area|base|basefont|
col|frame|input|isindex|param)$/ox
@ -327,7 +327,7 @@ module XHTML #:nodoc:
s << "/" if (@children.empty? && @closing == :self) or self.childless?
s << ">"
@children.each { |child| s << child.to_s }
s << "</#{@name}>" if @closing != :self && !@closing.nil? && !@children.empty?
s << "</#{@name}>" unless @closing == :self or self.childless? or @children.empty?
s.join
end
end