Merge pull request #8 from dpaleino/master

Code fixes for ruby 1.9
taginfo · Jul 4, 2012 · 6e7eac0 · 6e7eac0
2 parents 8f8b7bd + 3fd9102
commit 6e7eac0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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 @@ def initialize(file)
 
     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
@@ -27,6 +27,8 @@
 #
 #------------------------------------------------------------------------------
 
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
 require 'rubygems'
 require 'json'
 require 'sqlite3'