diff options
| -rw-r--r-- | web/lib/javascript.rb | 6 | ||||
| -rwxr-xr-x | web/taginfo.rb | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/web/lib/javascript.rb b/web/lib/javascript.rb index 86446fa..27b9790 100644 --- a/web/lib/javascript.rb +++ b/web/lib/javascript.rb @@ -6,7 +6,7 @@ def javascript(url=nil, &block) end def javascript_tags - @javascript.map{ |js| js.to_html } + @javascript.map{ |js| js.to_html }.join("\n") end class Javascript @@ -23,9 +23,9 @@ class Javascript def to_html if @file.nil? - %Q{ <script type="text/javascript">//<![CDATA[\n#{ @content }//]]></script>\n} + %Q{ <script type="text/javascript">//<![CDATA[\n#{ @content }//]]></script>} else - %Q{ <script type="text/javascript" src="/js/#{ @file }.js"></script>\n} + %Q{ <script type="text/javascript" src="/js/#{ @file }.js"></script>} end end diff --git a/web/taginfo.rb b/web/taginfo.rb index ae59a18..7ce46be 100755 --- a/web/taginfo.rb +++ b/web/taginfo.rb @@ -27,6 +27,8 @@ # #------------------------------------------------------------------------------ +$LOAD_PATH.unshift(File.dirname(__FILE__)) + require 'rubygems' require 'json' require 'sqlite3' |