Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #8 from dpaleino/master

Code fixes for ruby 1.9
  • Loading branch information...
commit 6e7eac0a71018fff0f71bb991eec03ce41a25415 2 parents 8f8b7bd + 3fd9102
@joto authored
Showing with 5 additions and 3 deletions.
  1. +3 −3 web/lib/javascript.rb
  2. +2 −0  web/taginfo.rb
View
6 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
View
2  web/taginfo.rb
@@ -27,6 +27,8 @@
#
#------------------------------------------------------------------------------
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
require 'rubygems'
require 'json'
require 'sqlite3'
Please sign in to comment.
Something went wrong with that request. Please try again.