Permalink
Browse files

don't bundle jquery.js

  • Loading branch information...
1 parent fbe2e7b commit 9902e70307e4832a31ee9787887fae2f4a075013 @defunkt defunkt committed Mar 20, 2011
Showing with 3 additions and 2 deletions.
  1. +1 −1 Rakefile
  2. +2 −1 app/templates/layout.mustache
  3. 0 public/js/{jquery.min.js → jquery.js}
View
@@ -38,7 +38,7 @@ task :bundle do
system "bundle install"
rm "public/js/bundle.js" rescue nil # >:O
rm "public/css/bundle.css" rescue nil
- system "cat public/js/*.js | uglifyjs -nc > public/js/bundle.js"
+ system "cat $(ls -1 public/js/*.js | grep -v jquery.js) | uglifyjs -nc > public/js/bundle.js"
system "uglifycss public/css/*.css > public/css/bundle.css"
end
@@ -6,6 +6,7 @@
{{# bundled?}}
<link type="text/css" href="/css/bundle.css" rel="stylesheet">
+ <script type="text/javascript" src="/js/jquery.js?1.3.2"></script>
<script type="text/javascript" src="/js/bundle.js"></script>
{{/ bundled?}}
@@ -16,7 +17,7 @@
<link rel="stylesheet" type="text/css" href="/css/jquery.autocomplete.css">
<link rel="stylesheet" type="text/css" href="/css/facebox.css">
- <script src="/js/jquery.min.js" type="text/javascript"></script>
+ <script src="/js/jquery.js" type="text/javascript"></script>
<script src="/js/jquery.form.js" type="text/javascript"></script>
<script src="/js/jquery.autocomplete.js" type="text/javascript"></script>
<script src="/js/jquery.relatize_date.js" type="text/javascript"></script>
File renamed without changes.

0 comments on commit 9902e70

Please sign in to comment.