Permalink
Browse files

Merge pull request #1 from joesteele/update_jammit_public_root

use Jammit.public_root if defined to support Jammit 0.6.5
  • Loading branch information...
2 parents 703c4bf + 3314b73 commit 7d329546ed04f260b537be7df01dfa7dbec71781 @artzte artzte committed Mar 22, 2012
Showing with 2 additions and 1 deletion.
  1. +2 −1 lib/jammit/middleware.rb
@@ -10,6 +10,7 @@ class Middleware
SUFFIX_STRIPPER = /-(datauri|mhtml)\Z/
+ PUBLIC_ROOT = defined?(Jammit.public_root) ? Jammit.public_root : PUBLIC_ROOT
NOT_FOUND_PATH = "#{PUBLIC_ROOT}/404.html"
def initialize(app)
@@ -111,4 +112,4 @@ def parse_request(pack, extension)
end
end
-end
+end

0 comments on commit 7d32954

Please sign in to comment.