bump handlebars_assets

This commit is contained in:
Jonne Haß 2014-09-01 11:44:34 +02:00
parent 1a5bcec394
commit 5da86def06
8 changed files with 10 additions and 1559 deletions

View file

@ -77,7 +77,7 @@ gem 'entypo-rails', '2.2.2'
# JavaScript # JavaScript
gem 'backbone-on-rails', '1.1.1' gem 'backbone-on-rails', '1.1.1'
gem 'handlebars_assets', '0.12.0' gem 'handlebars_assets', '0.17.1'
gem 'jquery-rails', '3.0.4' gem 'jquery-rails', '3.0.4'
gem 'js_image_paths', '0.0.1' gem 'js_image_paths', '0.0.1'

View file

@ -209,8 +209,9 @@ GEM
spork (>= 0.8.4) spork (>= 0.8.4)
haml (4.0.5) haml (4.0.5)
tilt tilt
handlebars_assets (0.12.0) handlebars_assets (0.17.1)
execjs (>= 1.2.9) execjs (>= 1.2.9)
multi_json
sprockets (>= 2.0.3) sprockets (>= 2.0.3)
tilt tilt
hashie (3.3.1) hashie (3.3.1)
@ -531,7 +532,7 @@ DEPENDENCIES
guard-rspec (= 4.3.1) guard-rspec (= 4.3.1)
guard-spork (= 1.5.1) guard-spork (= 1.5.1)
haml (= 4.0.5) haml (= 4.0.5)
handlebars_assets (= 0.12.0) handlebars_assets (= 0.17.1)
http_accept_language (= 2.0.2) http_accept_language (= 2.0.2)
i18n-inflector-rails (= 1.0.7) i18n-inflector-rails (= 1.0.7)
jasmine (= 2.0.2) jasmine (= 2.0.2)

View file

@ -1,4 +1,4 @@
/* we need to wrap this in a document ready to ensure JST is accessible */ /* we need to wrap this in a document ready to ensure JST is accessible */
$(function(){ $(function(){
Handlebars.registerPartial('status-message', JST['status-message_tpl']) Handlebars.registerPartial('status-message', HandlebarsTemplates['status-message_tpl'])
}); });

View file

@ -35,7 +35,7 @@ app.views.Base = Backbone.View.extend({
renderTemplate : function(){ renderTemplate : function(){
var presenter = _.isFunction(this.presenter) ? this.presenter() : this.presenter var presenter = _.isFunction(this.presenter) ? this.presenter() : this.presenter
this.template = JST[this.templateName+"_tpl"] this.template = HandlebarsTemplates[this.templateName+"_tpl"]
if(!this.template) { if(!this.template) {
console.log(this.templateName ? ("no template for " + this.templateName) : "no templateName specified") console.log(this.templateName ? ("no template for " + this.templateName) : "no templateName specified")
} }

View file

@ -1,5 +1,5 @@
//= require jquery //= require jquery
//= require handlebars-1.0.0.beta.6 //= require handlebars.runtime
//= require templates //= require templates
//= require main //= require main
//= require home //= require home

View file

@ -21,7 +21,7 @@
//= require jquery.autocomplete-custom //= require jquery.autocomplete-custom
//= require keycodes //= require keycodes
//= require fileuploader-custom //= require fileuploader-custom
//= require handlebars-1.0.0.beta.6 //= require handlebars.runtime
//= require markdown //= require markdown
//= require punycode //= require punycode
//= require parse_url //= require parse_url

View file

@ -2,7 +2,7 @@
<h1>diaspora* FAQ</h1> <h1>diaspora* FAQ</h1>
<br> <br>
<div class='question opened'> <div class='question opened'>
<h4>{{ getting_started_q }}}</h4> <h4>{{{ getting_started_q }}}</h4>
<div class='answer'> <div class='answer'>
{{{ getting_started_a }}} {{{ getting_started_a }}}
</div> </div>
@ -19,4 +19,4 @@
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>

File diff suppressed because it is too large Load diff