IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-08-26 21:27:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update ember-cloaking to remove dependency on I18n

Browse Source
This commit is contained in:
Robin Ward
2014-01-17 16:56:24 -05:00
parent 3bbe595d10
commit 55397361be
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/discourse/controllers/topic_controller.js
+4
View File
@@ -329,6 +329,10 @@ Discourse.TopicController = Discourse.ObjectController.extend(Discourse.Selected
return Discourse.User.current() && !this.get('isPrivateMessage');
}.property('isPrivateMessage'),
loadingHTML: function() {
return "<div class='spinner'>" + I18n.t('loading') + "</div>";
}.property(),
recoverTopic: function() {
this.get('content').recover();
},
app/assets/javascripts/discourse/templates/topic.js.handlebars
+1 -1
View File
@@ -64,7 +64,7 @@
{{/if}}
{{#unless postStream.loadingFilter}}
{{cloaked-collection cloakView="post" idProperty="post_number" defaultHeight="200" content=postStream.posts slackRatio=slackRatio}}
{{cloaked-collection cloakView="post" idProperty="post_number" defaultHeight="200" content=postStream.posts slackRatio=slackRatio loadingHTML=controller.loadingHTML}}
{{/unless}}
{{#if postStream.loadingBelow}}