Skip to content

Concatenate JavaScripts with semicolon. #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Concatenate JavaScripts with semicolon. #217

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/jammit/compressor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ def initialize
# YUI Compressor (with munging enabled). JST can optionally be included.
def compress_js(paths)
if (jst_paths = paths.grep(Jammit.template_extension_matcher)).empty?
js = concatenate(paths)
js = concatenate(paths, ";\n")
else
js = concatenate(paths - jst_paths) + compile_jst(jst_paths)
js = concatenate(paths - jst_paths, ";\n") + compile_jst(jst_paths)
end
Jammit.compress_assets ? @js_compressor.compress(js) : js
end
Expand Down Expand Up @@ -240,8 +240,8 @@ def mime_type(asset_path)
end

# Concatenate together a list of asset files.
def concatenate(paths)
[paths].flatten.map {|p| read_binary_file(p) }.join("\n")
def concatenate(paths, separator="\n")
[paths].flatten.map {|p| read_binary_file(p) }.join(separator)
end

# `File.read`, but in "binary" mode.
Expand Down