diff options
author | Jonne Haß <me@jhass.eu> | 2014-10-14 17:04:01 +0400 |
---|---|---|
committer | Jonne Haß <me@jhass.eu> | 2014-10-14 17:04:01 +0400 |
commit | 4e6eacbeb105b5c2e91d373b2066e145dfffe977 (patch) | |
tree | b2a84be4d7da6d43303835acf7126f8212dd1f62 /app | |
parent | 13cb07fed746a61cbe1f9aa4f4d584d2054ff3ab (diff) |
Update _.template calls to undscore.js 1.7
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/app/helpers/handlebars-helpers.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/helpers/alert.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/helpers/i18n.js | 4 |
3 files changed, 4 insertions, 4 deletions
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 ""; |