Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade jQuery to 2.0.3

This commit is contained in:
Robin Ward 2013-07-31 16:30:31 -04:00
parent 05fc50006d
commit 4a0ea7f776
6 changed files with 3924 additions and 4680 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/application.js.erb
View File

@ -10,10 +10,17 @@
//= require ./discourse/components/probes.js //= require ./discourse/components/probes.js
// Externals we need to load first // Externals we need to load first
//= require ./external/jquery-1.9.1.js
//= require ./external/jquery.ui.widget.js
//= require ./external/handlebars.js
<% <%
if Rails.env.development?
require_asset ("./external_development/jquery-2.0.3.js")
else
require_asset ("./external_production/jquery-2.0.3.min.js")
end
require_asset ("./external/jquery.ui.widget.js")
require_asset ("./external/handlebars.js")
if Rails.env.development? if Rails.env.development?
require_asset ("./external_development/ember.js") require_asset ("./external_development/ember.js")
require_asset ("./external_development/group-helper.js") require_asset ("./external_development/group-helper.js")

8580
app/assets/javascripts/external/jquery-1.9.1.js → app/assets/javascripts/external_development/jquery-2.0.3.js vendored
View File

File diff suppressed because it is too large Load Diff

6
app/assets/javascripts/external_production/jquery-2.0.3.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
app/assets/javascripts/jquery.js.erb
View File

@ -1 +0,0 @@
//= require ./external/jquery-1.9.1.js

2
config/application.rb
View File

@ -41,7 +41,7 @@ module Discourse
config.assets.paths += %W(#{config.root}/config/locales) config.assets.paths += %W(#{config.root}/config/locales)
config.assets.precompile += ['admin.js', 'admin.css', 'shiny/shiny.css', 'preload_store.js', 'jquery.js'] config.assets.precompile += ['admin.js', 'admin.css', 'shiny/shiny.css', 'preload_store.js']
# Precompile all defer # Precompile all defer
Dir.glob("#{config.root}/app/assets/javascripts/defer/*.js").each do |file| Dir.glob("#{config.root}/app/assets/javascripts/defer/*.js").each do |file|

2
test/javascripts/test_helper.js
View File

@ -9,7 +9,7 @@
//= require ../../app/assets/javascripts/discourse/components/probes.js //= require ../../app/assets/javascripts/discourse/components/probes.js
// Externals we need to load first // Externals we need to load first
//= require ../../app/assets/javascripts/external/jquery-1.9.1.js //= require ../../app/assets/javascripts/external_development/jquery-2.0.3.js
//= require ../../app/assets/javascripts/external/jquery.ui.widget.js //= require ../../app/assets/javascripts/external/jquery.ui.widget.js
//= require ../../app/assets/javascripts/external/handlebars.js //= require ../../app/assets/javascripts/external/handlebars.js
//= require ../../app/assets/javascripts/external_development/ember.js //= require ../../app/assets/javascripts/external_development/ember.js