Update Ember.js, Handlebars and jQuery to latest

This commit is contained in:
Robin Ward 2014-04-15 11:22:15 -04:00
parent a8011a5b63
commit 73cc722ed5
10 changed files with 86890 additions and 73390 deletions

View file

@ -88,8 +88,8 @@ gem 'active_model_serializers'
gem 'onebox' gem 'onebox'
gem 'ember-rails' gem 'ember-rails'
gem 'ember-source', '~> 1.2.0.1' gem 'ember-source', '1.6.0.beta.2'
gem 'handlebars-source', '~> 1.1.2' gem 'handlebars-source', '1.3.0'
gem 'barber' gem 'barber'
gem 'message_bus' gem 'message_bus'

View file

@ -80,8 +80,8 @@ GEM
handlebars-source handlebars-source
jquery-rails (>= 1.0.17) jquery-rails (>= 1.0.17)
railties (>= 3.1) railties (>= 3.1)
ember-source (1.2.0.1) ember-source (1.6.0.beta.2)
handlebars-source (~> 1.1.2) handlebars-source (~> 1.0)
erubis (2.7.0) erubis (2.7.0)
eventmachine (1.0.3) eventmachine (1.0.3)
excon (0.28.0) excon (0.28.0)
@ -123,7 +123,7 @@ GEM
given_core (3.5.4) given_core (3.5.4)
sorcerer (>= 0.3.7) sorcerer (>= 0.3.7)
guess_html_encoding (0.0.9) guess_html_encoding (0.0.9)
handlebars-source (1.1.2) handlebars-source (1.3.0)
hashie (2.0.5) hashie (2.0.5)
hexpress (1.2.0) hexpress (1.2.0)
highline (1.6.20) highline (1.6.20)
@ -400,7 +400,7 @@ DEPENDENCIES
discourse_plugin! discourse_plugin!
email_reply_parser-discourse email_reply_parser-discourse
ember-rails ember-rails
ember-source (~> 1.2.0.1) ember-source (= 1.6.0.beta.2)
eventmachine eventmachine
fabrication fabrication
fakeweb (~> 1.3.0) fakeweb (~> 1.3.0)
@ -412,7 +412,7 @@ DEPENDENCIES
fog (= 1.18.0) fog (= 1.18.0)
foreman foreman
gctools gctools
handlebars-source (~> 1.1.2) handlebars-source (= 1.3.0)
highline highline
hiredis hiredis
image_optim (= 0.9.1) image_optim (= 0.9.1)

View file

@ -1,7 +1,7 @@
<% <%
if Rails.env.development? || Rails.env.test? if Rails.env.development? || Rails.env.test?
require_asset ("development/jquery-2.0.3.js") require_asset ("development/jquery-2.1.0.js")
else else
require_asset ("production/jquery-2.0.3.min.js") require_asset ("production/jquery-2.1.0.min.js")
end end
%> %>

View file

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

76094
vendor/assets/javascripts/development/ember.js vendored Executable file → Normal file

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long