Skip to content
Browse files

update to latest ember

  • Loading branch information...
1 parent 1614e7d commit 99730c7d07cc1418862bfddf6ba7686810494d0c @tchak tchak committed
View
2 lib/ember-rails/version.rb
@@ -1,4 +1,4 @@
module EmberRails
VERSION = "0.2.4"
- EMBER_VERSION = "0.9.4"
+ EMBER_VERSION = "0.9.6"
end
View
16,022 vendor/assets/javascripts/ember-dev.js
8,871 additions, 7,151 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
10 vendor/assets/javascripts/ember-precompiler.js
@@ -15,18 +15,12 @@ console.log = console.info = console.warn = console.error = function(){};
var jQuery = window.jQuery = function() { return jQuery };
jQuery.ready = function() { return jQuery };
jQuery.inArray = function() { return jQuery };
-jQuery.jquery = "1.7";
+jQuery.jquery = "1.7.2";
var $ = jQuery;
// Precompiler
var EmberRails = {
precompile: function(string) {
- // Copied from the Ember codebase. This will need to be updated as Ember updates...
- var ast = Handlebars.parse(string);
- var options = { data: true, stringParams: true };
- var environment = new Ember.Handlebars.Compiler().compile(ast, options);
- var templateSpec = new Ember.Handlebars.JavaScriptCompiler().compile(environment, options, undefined, true);
-
- return templateSpec.toString();
+ return Ember.Handlebars.precompile(string).toString();
}
};
View
12,103 vendor/assets/javascripts/ember-runtime-dev.js
6,693 additions, 5,410 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
9,924 vendor/assets/javascripts/ember-runtime.js
9,919 additions, 5 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
17,231 vendor/assets/javascripts/ember.js
17,222 additions, 9 deletions not shown because the diff is too large. Please use a local Git client to view these changes.

0 comments on commit 99730c7

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