From 5994b630b725a8eb9d215974e2d89b4f0ce4b4de Mon Sep 17 00:00:00 2001
From: riking <rikingcoding@gmail.com>
Date: Tue, 9 Sep 2014 12:47:30 -0700
Subject: [PATCH] Final dirty diff cleanup
---
app/assets/javascripts/discourse/models/notification.js | 4 +++-
.../discourse/templates/notifications.js.handlebars | 6 +-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/app/assets/javascripts/discourse/models/notification.js b/app/assets/javascripts/discourse/models/notification.js
index 90bc5fe4f..8fcb27427 100644
--- a/app/assets/javascripts/discourse/models/notification.js
+++ b/app/assets/javascripts/discourse/models/notification.js
@@ -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;
});
},
diff --git a/app/assets/javascripts/discourse/templates/notifications.js.handlebars b/app/assets/javascripts/discourse/templates/notifications.js.handlebars
index b7117b7af..22b92515c 100644
--- a/app/assets/javascripts/discourse/templates/notifications.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/notifications.js.handlebars
@@ -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>