From 1af2ff6201a6dd9bc80c686a4f4c9b9aff7955a8 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 30 May 2014 12:16:23 -0400
Subject: [PATCH] ES6: More components moved over.

---
 ...ps_list_component.js => groups-list.js.es6} |  2 +-
 ...tem_component.js => navigation-item.js.es6} |  2 +-
 .../components/notification-item.js.es6        | 18 ++++++++++++++++++
 .../components/notification_item_component.js  | 11 -----------
 .../keyboard_shortcuts.js}                     |  0
 .../components/notification-item.js.handlebars |  1 -
 .../templates/notifications.js.handlebars      |  2 +-
 config/initializers/silence_logger.rb          |  3 ++-
 .../notifications_controller_test.js           |  4 ++--
 9 files changed, 25 insertions(+), 18 deletions(-)
 rename app/assets/javascripts/discourse/components/{groups_list_component.js => groups-list.js.es6} (78%)
 rename app/assets/javascripts/discourse/components/{navigation_item_component.js => navigation-item.js.es6} (96%)
 create mode 100644 app/assets/javascripts/discourse/components/notification-item.js.es6
 delete mode 100644 app/assets/javascripts/discourse/components/notification_item_component.js
 rename app/assets/javascripts/discourse/{components/keyboard_shortcuts_component.js => lib/keyboard_shortcuts.js} (100%)
 delete mode 100644 app/assets/javascripts/discourse/templates/components/notification-item.js.handlebars

diff --git a/app/assets/javascripts/discourse/components/groups_list_component.js b/app/assets/javascripts/discourse/components/groups-list.js.es6
similarity index 78%
rename from app/assets/javascripts/discourse/components/groups_list_component.js
rename to app/assets/javascripts/discourse/components/groups-list.js.es6
index 0f78ba24f53..09ac3c3dbad 100644
--- a/app/assets/javascripts/discourse/components/groups_list_component.js
+++ b/app/assets/javascripts/discourse/components/groups-list.js.es6
@@ -6,7 +6,7 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.GroupsListComponent = Em.Component.extend({
+export default Em.Component.extend({
   classNames: ['groups']
 });
 
diff --git a/app/assets/javascripts/discourse/components/navigation_item_component.js b/app/assets/javascripts/discourse/components/navigation-item.js.es6
similarity index 96%
rename from app/assets/javascripts/discourse/components/navigation_item_component.js
rename to app/assets/javascripts/discourse/components/navigation-item.js.es6
index e9e8f3e72c2..ff5b01acd5d 100644
--- a/app/assets/javascripts/discourse/components/navigation_item_component.js
+++ b/app/assets/javascripts/discourse/components/navigation-item.js.es6
@@ -6,7 +6,7 @@
   @namespace Discourse
   @module Discourse
 **/
-Discourse.NavigationItemComponent = Ember.Component.extend({
+export default Ember.Component.extend({
   tagName: 'li',
   classNameBindings: ['active', 'content.hasIcon:has-icon'],
   attributeBindings: ['title'],
diff --git a/app/assets/javascripts/discourse/components/notification-item.js.es6 b/app/assets/javascripts/discourse/components/notification-item.js.es6
new file mode 100644
index 00000000000..81d8629cf44
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/notification-item.js.es6
@@ -0,0 +1,18 @@
+export default Ember.Component.extend({
+  tagName: 'li',
+  classNameBindings: ['notification.read'],
+
+  _markRead: function(){
+    var self = this;
+    this.$('a').click(function(){
+      self.set('notification.read', true);
+      return true;
+    });
+  }.on('didInsertElement'),
+
+  render: function(buffer) {
+    var notification = this.get('notification'),
+        text = I18n.t(this.get('scope'), Em.getProperties(notification, 'link', 'username'));
+    buffer.push('<span>' + text + '</span>');
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/notification_item_component.js b/app/assets/javascripts/discourse/components/notification_item_component.js
deleted file mode 100644
index 238f79651bc..00000000000
--- a/app/assets/javascripts/discourse/components/notification_item_component.js
+++ /dev/null
@@ -1,11 +0,0 @@
-Discourse.NotificationItemComponent = Ember.Component.extend({
-  tagName: 'span',
-  didInsertElement: function(){
-    var self = this;
-    this.$('a').click(function(){
-      self.set('model.read', true);
-      self.rerender();
-      return true;
-    });
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/keyboard_shortcuts_component.js b/app/assets/javascripts/discourse/lib/keyboard_shortcuts.js
similarity index 100%
rename from app/assets/javascripts/discourse/components/keyboard_shortcuts_component.js
rename to app/assets/javascripts/discourse/lib/keyboard_shortcuts.js
diff --git a/app/assets/javascripts/discourse/templates/components/notification-item.js.handlebars b/app/assets/javascripts/discourse/templates/components/notification-item.js.handlebars
deleted file mode 100644
index 50879cae4ff..00000000000
--- a/app/assets/javascripts/discourse/templates/components/notification-item.js.handlebars
+++ /dev/null
@@ -1 +0,0 @@
-{{unbound boundI18n scope linkBinding="model.link" usernameBinding="model.username"}}
diff --git a/app/assets/javascripts/discourse/templates/notifications.js.handlebars b/app/assets/javascripts/discourse/templates/notifications.js.handlebars
index dd856989ea0..1ad8a997be0 100644
--- a/app/assets/javascripts/discourse/templates/notifications.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/notifications.js.handlebars
@@ -3,7 +3,7 @@
     {{#if content}}
       <ul>
         {{#each}}
-        <li {{bind-attr class="read"}}>{{notification-item model=this scope=scope}}</li>
+          {{notification-item notification=this scope=scope}}
         {{/each}}
         <li class="read last">
           <a {{bind-attr href="currentUser.path"}}>{{i18n notifications.more}} &hellip;</a>
diff --git a/config/initializers/silence_logger.rb b/config/initializers/silence_logger.rb
index 954b153cd97..4040d5dfb4b 100644
--- a/config/initializers/silence_logger.rb
+++ b/config/initializers/silence_logger.rb
@@ -18,7 +18,8 @@ class SilenceLogger < Rails::Rack::Logger
     if    env[HTTP_X_SILENCE_LOGGER] ||
           @opts[:silenced].include?(path_info) ||
           path_info.start_with?('/logs') ||
-          path_info.start_with?('/user_avatar')
+          path_info.start_with?('/user_avatar') ||
+          path_info.start_with?('/letter_avatar')
       Rails.logger.level = Logger::WARN
       @app.call(env)
     else
diff --git a/test/javascripts/controllers/notifications_controller_test.js b/test/javascripts/controllers/notifications_controller_test.js
index 16951f72faa..4f7fe77e9e5 100644
--- a/test/javascripts/controllers/notifications_controller_test.js
+++ b/test/javascripts/controllers/notifications_controller_test.js
@@ -71,10 +71,10 @@ test("displays a list of notifications and a 'more' link when there are notifica
   var items = fixture(itemSelector);
   equal(count(items), 3, "number of list items is correct");
 
-  equal(items.eq(0).attr("class"), "", "first (unread) item has proper class");
+  equal(items.eq(0).attr("class"), "ember-view", "first (unread) item has proper class");
   equal(items.eq(0).text().trim(), "scope_1 username_1 link_1", "first item has correct content");
 
-  equal(items.eq(1).attr("class"), "read", "second (read) item has proper class");
+  equal(items.eq(1).attr("class"), "ember-view read", "second (read) item has proper class");
   equal(items.eq(1).text().trim(), "scope_2 username_2 link_2", "second item has correct content");
 
   var moreLink = items.eq(2).find("> a");