Final dirty diff cleanup

This commit is contained in:
riking 2014-09-09 12:47:30 -07:00
parent 69bc552054
commit 5994b630b7
2 changed files with 4 additions and 6 deletions

View File

@ -17,10 +17,12 @@ Discourse.NotificationContainer.reopenClass({
},
loadRecent: function() {
// TODO - add .json (breaks tests atm)
return Discourse.ajax('/notifications').then(function(result) {
return Discourse.NotificationContainer.createFromJson(result);
}).catch(function(error) {
// HeaderController can't handle it properly
// TODO HeaderController can't handle a createFromError
// just throw for now
throw error;
});
},

View File

@ -10,11 +10,7 @@
</li>
</ul>
{{else}}
{{#if error}}
<div class="none error">{{i18n notifications.none}}</div>
{{else}}
<div class="none">{{i18n notifications.none}}</div>
{{/if}}
<div class="none">{{i18n notifications.none}}</div>
{{/if}}
{{else}}
<div class='loading'><i class='fa fa-spinner fa-spin'></i></div>