From 4e6eacbeb105b5c2e91d373b2066e145dfffe977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 14 Oct 2014 15:04:01 +0200
Subject: Update _.template calls to undscore.js 1.7

---
 app/assets/javascripts/app/helpers/handlebars-helpers.js | 2 +-
 app/assets/javascripts/helpers/alert.js                  | 2 +-
 app/assets/javascripts/helpers/i18n.js                   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/assets/javascripts/app/helpers/handlebars-helpers.js b/app/assets/javascripts/app/helpers/handlebars-helpers.js
index cea31311a..9fca473c3 100644
--- a/app/assets/javascripts/app/helpers/handlebars-helpers.js
+++ b/app/assets/javascripts/app/helpers/handlebars-helpers.js
@@ -67,7 +67,7 @@ Handlebars.registerHelper('personImage', function(person, size, imageClass) {
   size = ( !_.isString(size) ) ? "small" : size;
   imageClass = ( !_.isString(imageClass) ) ? size : imageClass;
 
-  return _.template('<img src="<%= src %>" class="avatar <%= img_class %>" title="<%= title %>" alt="<%= title %>" />', {
+  return _.template('<img src="<%= src %>" class="avatar <%= img_class %>" title="<%= title %>" alt="<%= title %>" />')({
     'src': avatar[size],
     'img_class': imageClass,
     'title': _.escape(name)
diff --git a/app/assets/javascripts/helpers/alert.js b/app/assets/javascripts/helpers/alert.js
index 08dd06dea..9f4dc97bd 100644
--- a/app/assets/javascripts/helpers/alert.js
+++ b/app/assets/javascripts/helpers/alert.js
@@ -12,7 +12,7 @@ Diaspora.Alert = {
     '</div>',
 
   show: function(title, content) {
-    $(_.template(this.faceboxTemplate, {
+    $(_.template(this.faceboxTemplate)({
       title: title,
     content: content
     })).appendTo(document.body);
diff --git a/app/assets/javascripts/helpers/i18n.js b/app/assets/javascripts/helpers/i18n.js
index 442f6fdf9..0c0f14326 100644
--- a/app/assets/javascripts/helpers/i18n.js
+++ b/app/assets/javascripts/helpers/i18n.js
@@ -48,7 +48,7 @@ Diaspora.I18n = {
         }
       }
     }
-   
+
     return translatedMessage;
   },
 
@@ -60,7 +60,7 @@ Diaspora.I18n = {
     }
 
     try {
-      return _.template(this._resolve(locale, items), views || {});
+      return _.template(this._resolve(locale, items))(views || {});
     } catch (e) {
       if (typeof locale.fallback === "undefined") {
         return "";
-- 
cgit v1.2.3