nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update _.template calls to undscore.js 1.7

Browse source
This commit is contained in:
Jonne Haß 2014-10-14 15:04:01 +02:00
parent 13cb07fed7
commit 4e6eacbeb1
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/helpers/handlebars-helpers.js
View file

@ -67,7 +67,7 @@ Handlebars.registerHelper('personImage', function(person, size, imageClass) {
size = ( !_.isString(size) ) ? "small" : size; size = ( !_.isString(size) ) ? "small" : size;
imageClass = ( !_.isString(imageClass) ) ? size : imageClass; 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], 'src': avatar[size],
'img_class': imageClass, 'img_class': imageClass,
'title': _.escape(name) 'title': _.escape(name)

2
app/assets/javascripts/helpers/alert.js
View file

@ -12,7 +12,7 @@ Diaspora.Alert = {
'</div>', '</div>',
show: function(title, content) { show: function(title, content) {
$(_.template(this.faceboxTemplate, { $(_.template(this.faceboxTemplate)({
title: title, title: title,
content: content content: content
})).appendTo(document.body); })).appendTo(document.body);

4
app/assets/javascripts/helpers/i18n.js
View file

@ -48,7 +48,7 @@ Diaspora.I18n = {
} }
} }
} }
return translatedMessage; return translatedMessage;
}, },
@ -60,7 +60,7 @@ Diaspora.I18n = {
} }
try { try {
return _.template(this._resolve(locale, items), views || {}); return _.template(this._resolve(locale, items))(views || {});
} catch (e) { } catch (e) {
if (typeof locale.fallback === "undefined") { if (typeof locale.fallback === "undefined") {
return ""; return "";