Merge pull request #5190 from jhass/bump_handlebars

bump handlebars_assets

Conflicts:
	Gemfile

Gemfile

@@ -77,7 +77,7 @@ gem 'entypo-rails', '2.2.2'
 # JavaScript
 
 gem 'backbone-on-rails',   '1.1.1'
-gem 'handlebars_assets',   '0.12.0'
+gem 'handlebars_assets',   '0.17.1'
 gem 'jquery-rails',        '3.1.1'
 gem 'rails-assets-jquery', '1.11.1' # Should be kept in sync with jquery-rails
 gem 'js_image_paths',      '0.0.1'

Gemfile.lock

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

app/assets/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', JST['status-message_tpl'])
+  Handlebars.registerPartial('status-message', HandlebarsTemplates['status-message_tpl'])
 });

app/assets/javascripts/app/views.js

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

app/assets/javascripts/jasmine-load-all.js

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

app/assets/javascripts/main.js

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

app/assets/templates/faq_getting_help_tpl.jst.hbs

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