From 7d60d96132455ea772aafa1e408816887a34b0c5 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Sun, 5 Feb 2012 21:18:08 -0800 Subject: [PATCH] set handlebars compiler in jammit config.yml (handlebars worries about maintaining a compilation cache, we don't have to do this manually.) [ci skip] --- config/assets.yml | 2 +- config/assets_test.yml | 2 +- public/javascripts/app/helpers/handlebars-partials.js | 2 +- public/javascripts/app/views.js | 8 ++------ spec/javascripts/support/jasmine.yml | 2 +- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/config/assets.yml b/config/assets.yml index 6458112d4..73e761b2d 100644 --- a/config/assets.yml +++ b/config/assets.yml @@ -3,7 +3,7 @@ embed_assets: datauri compress_assets: on gzip_assets: off -template_function: off +template_function: Handlebars.compile template_extension: 'handlebars' javascripts: diff --git a/config/assets_test.yml b/config/assets_test.yml index 4df14904c..821f595b5 100644 --- a/config/assets_test.yml +++ b/config/assets_test.yml @@ -1,5 +1,5 @@ package_assets: on -template_function: off +template_function: Handlebars.compile template_extension: 'handlebars' javascripts: diff --git a/public/javascripts/app/helpers/handlebars-partials.js b/public/javascripts/app/helpers/handlebars-partials.js index 228d438dd..16fda5897 100644 --- a/public/javascripts/app/helpers/handlebars-partials.js +++ b/public/javascripts/app/helpers/handlebars-partials.js @@ -1,4 +1,4 @@ /* we need to wrap this in a document ready to ensure JST is accessible */ $(function(){ - Handlebars.registerPartial('status-message', Handlebars.compile(JST['status-message'])) + Handlebars.registerPartial('status-message', JST['status-message']) }) \ No newline at end of file diff --git a/public/javascripts/app/views.js b/public/javascripts/app/views.js index 49332c6b5..b55c6a041 100644 --- a/public/javascripts/app/views.js +++ b/public/javascripts/app/views.js @@ -1,4 +1,5 @@ app.views.Base = Backbone.View.extend({ + presenter : function(){ return this.defaultPresenter() }, @@ -22,13 +23,8 @@ app.views.Base = Backbone.View.extend({ }, renderTemplate : function(){ - var templateHTML //don't forget to regenerate your jasmine fixtures ;-) var presenter = _.isFunction(this.presenter) ? this.presenter() : this.presenter - - window.templateCache = window.templateCache || {} - templateHTML = JST[this.templateName]; - this.template = templateCache[this.templateName] = templateCache[this.templateName] || Handlebars.compile(templateHTML); - + this.template = JST[this.templateName] $(this.el).html(this.template(presenter)); this.postRenderTemplate(); }, diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml index 111dcda82..430b53186 100644 --- a/spec/javascripts/support/jasmine.yml +++ b/spec/javascripts/support/jasmine.yml @@ -12,6 +12,7 @@ # src_files: # load up our outputted templates, bound to window.JST + - public/javascripts/vendor/handlebars-1.0.0.beta.6.js - public/assets/app.js - public/javascripts/vendor/underscore.js @@ -30,7 +31,6 @@ src_files: - public/javascripts/vendor/markdown/* - public/javascripts/vendor/jquery.placeholder.js - public/javascripts/vendor/backbone.js - - public/javascripts/vendor/handlebars-1.0.0.beta.6.js - public/javascripts/fileuploader-custom.js - public/javascripts/jquery.autocomplete-custom.js - public/javascripts/diaspora.js