Final dirty diff cleanup

discourse · Sep 9, 2014 · 5994b63 · 5994b63
1 parent 69bc552
commit 5994b63
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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>