Fix JS concatnation.

yuya-takeyama · Jun 17, 2012 · 2b437a8 · 2b437a8
1 parent 58d2e80
commit 2b437a8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/install.sh b/install.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 lessc ./vendor/bootstrap/less/bootstrap.less > public/css/bootstrap.css
 lessc ./vendor/bootstrap/less/responsive.less > public/css/bootstrap-responsive.css
-cat ./vendor/bootstrap/js/*.js > public/js/bootstrap.js
+cat ./vendor/bootstrap/js/bootstrap-{transition,alert,button,carousel,collapse,dropdown,modal,tooltip,popover,scrollspy,tab,typeahead}.js > public/js/bootstrap.js
diff --git a/views/layout.haml b/views/layout.haml
@@ -5,8 +5,7 @@
     %link(href="/css/bootstrap.css" rel="stylesheet")
     %link(href="/css/bootstrap-responsive.css" rel="stylesheet")
     %script(src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js")
-    %script(src="/js/bootstrap-dropdown.js")
-    %script(src="/js/bootstrap-collapse.js")
+    %script(src="/js/bootstrap.js")
     :javascript
       $(document).ready(function () {
         $('.dropdown-toggle').dropdown();