Skip to content
Browse files

Add jQuery to our own packed js file.

  • Loading branch information...
1 parent 32e3f7e commit 733827674eb7c950c00a738d8651009c3450bdaa @hmans committed
Showing with 674 additions and 2 deletions.
  1. +673 −0 lib/assets/js/jquery-1.7.1.js
  2. +1 −1 lib/schnitzelpress/actions/assets.rb
  3. +0 −1 lib/views/layout.haml
View
673 lib/assets/js/jquery-1.7.1.js
673 additions, 0 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
2 lib/schnitzelpress/actions/assets.rb
@@ -17,7 +17,7 @@ module Assets
extend ActiveSupport::Concern
ASSET_TIMESTAMP = Time.now.to_i
- JAVASCRIPT_ASSETS = ['jquery.cookie.js', 'schnitzelpress.js']
+ JAVASCRIPT_ASSETS = ['jquery-1.7.1.js', 'jquery.cookie.js', 'schnitzelpress.js']
included do
get '/assets/schnitzelpress.:timestamp.css' do
View
1 lib/views/layout.haml
@@ -29,6 +29,5 @@
- if production? && config.gauges_id.present?
= partial 'gauges'
- %script{ :type => 'text/javascript', :src => '//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js' }
%script{ :type => 'text/javascript', :src => '//browserid.org/include.js' }
%script{ :type => 'text/javascript', :src => "/assets/schnitzelpress.#{ASSET_TIMESTAMP}.js" }

0 comments on commit 7338276

Please sign in to comment.
Something went wrong with that request. Please try again.