diff options
| author | Gleb Mazovetskiy <glebm@google.com> | 2015-01-15 00:38:39 +0300 |
|---|---|---|
| committer | Gleb Mazovetskiy <glebm@google.com> | 2015-01-18 01:49:15 +0300 |
| commit | b4c0349be3f871aa782ba786ada9265b4d80a794 (patch) | |
| tree | 107f3b1d67f69bb263a796875ad37e1dbf7d039f | |
| parent | 06629e712d6757775d3b266841d341e02ff8253f (diff) | |
Update bower.json to use one JS file #812
| -rw-r--r-- | bower.json | 14 | ||||
| -rw-r--r-- | tasks/bower.rake | 5 |
2 files changed, 3 insertions, 16 deletions
@@ -15,18 +15,8 @@ "assets/fonts/bootstrap/glyphicons-halflings-regular.svg", "assets/fonts/bootstrap/glyphicons-halflings-regular.ttf", "assets/fonts/bootstrap/glyphicons-halflings-regular.woff", - "assets/javascripts/bootstrap/affix.js", - "assets/javascripts/bootstrap/alert.js", - "assets/javascripts/bootstrap/button.js", - "assets/javascripts/bootstrap/carousel.js", - "assets/javascripts/bootstrap/collapse.js", - "assets/javascripts/bootstrap/dropdown.js", - "assets/javascripts/bootstrap/tab.js", - "assets/javascripts/bootstrap/transition.js", - "assets/javascripts/bootstrap/scrollspy.js", - "assets/javascripts/bootstrap/modal.js", - "assets/javascripts/bootstrap/tooltip.js", - "assets/javascripts/bootstrap/popover.js" + "assets/fonts/bootstrap/glyphicons-halflings-regular.woff2", + "assets/javascripts/bootstrap.js" ], "keywords": [ "twbs", diff --git a/tasks/bower.rake b/tasks/bower.rake index 9cbe993..5598e88 100644 --- a/tasks/bower.rake +++ b/tasks/bower.rake @@ -15,14 +15,11 @@ namespace :bower do require 'bootstrap-sass' Dir.chdir Bootstrap.gem_path do spec = JSON.parse(File.read 'bower.json') - js_paths = File.read(File.join Bootstrap.javascripts_path, 'bootstrap-sprockets.js').lines.map do |line| - line.strip if line.sub!(%r(//\s*=\s*require\s*(?:./)?(.*)\s*), 'assets/javascripts/\1.js') - end.compact spec['main'] = find_files.(File.join(Bootstrap.stylesheets_path, '_bootstrap.scss')) + find_files.(Bootstrap.fonts_path) + - js_paths + %w(assets/javascripts/bootstrap.js) spec['version'] = Bootstrap::VERSION[0..-3] |