lib/jammit/packager.rb in jammit-0.4.0 vs lib/jammit/packager.rb in jammit-0.4.1
- old
+ new
@@ -91,11 +91,10 @@
# Look up a package asset list by name, raising an exception if the
# package has gone missing.
def package_for(package, extension)
pack = @packages[extension] && @packages[extension][package]
- pack ||= @packages[:js] && @packages[:js][package] if extension == :jst
pack || not_found(package, extension)
end
# Absolute globs are absolute -- relative globs are relative to ASSET_ROOT.
def glob_files(glob)
@@ -125,15 +124,10 @@
config.each do |name, globs|
globs ||= []
packages[name] = {}
paths = globs.map {|glob| glob_files(glob) }.flatten.uniq
packages[name][:paths] = paths
- if !paths.grep(JS_EXT).empty? && !paths.grep(JST_EXT).empty?
- packages[name][:urls] = paths.grep(JS_EXT).map {|path| path.sub(PATH_TO_URL, '') }
- packages[name][:urls] += [Jammit.asset_url(name, :jst)]
- else
- packages[name][:urls] = paths.map {|path| path.sub(PATH_TO_URL, '') }
- end
+ packages[name][:urls] = paths.map {|path| path.sub(PATH_TO_URL, '') }
end
packages
end
# Raise a PackageNotFound exception for missing packages...
\ No newline at end of file