mirror of
https://github.com/twbs/bootstrap-sass.git
synced 2022-11-09 12:27:02 -05:00
Use dist/js/bootstrap.js from upstream #777
Before we compiled bootstrap.js by concatenating individual files. This copies the file from upstream for maximum compatibility.
This commit is contained in:
parent
41ea576e9d
commit
faac9f3c4d
2 changed files with 544 additions and 529 deletions
1068
assets/javascripts/bootstrap.js
vendored
1068
assets/javascripts/bootstrap.js
vendored
File diff suppressed because it is too large
Load diff
|
@ -12,14 +12,13 @@ class Converter
|
||||||
|
|
||||||
log_status 'Updating javascript manifest'
|
log_status 'Updating javascript manifest'
|
||||||
manifest = ''
|
manifest = ''
|
||||||
cat = ''
|
|
||||||
bootstrap_js_files.each do |name|
|
bootstrap_js_files.each do |name|
|
||||||
cat << contents[name] + "\n"
|
|
||||||
name = name.gsub(/\.js$/, '')
|
name = name.gsub(/\.js$/, '')
|
||||||
manifest << "//= require ./bootstrap/#{name}\n"
|
manifest << "//= require ./bootstrap/#{name}\n"
|
||||||
end
|
end
|
||||||
|
dist_js = read_files('dist/js', ['bootstrap.js'])['bootstrap.js']
|
||||||
{'assets/javascripts/bootstrap-sprockets.js' => manifest,
|
{'assets/javascripts/bootstrap-sprockets.js' => manifest,
|
||||||
'assets/javascripts/bootstrap.js' => cat}.each do |path, content|
|
'assets/javascripts/bootstrap.js' => dist_js}.each do |path, content|
|
||||||
save_file path, content
|
save_file path, content
|
||||||
log_processed path
|
log_processed path
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue