From 2f8a449b7465df3df85cfe5f3723bd71b908247b Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Fri, 4 Sep 2015 12:12:48 +0930
Subject: [PATCH] Simplify notification markup

---
 js/forum/src/components/Notification.js | 27 ++++++++++++++-----------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/js/forum/src/components/Notification.js b/js/forum/src/components/Notification.js
index a130e5870..52b61829c 100644
--- a/js/forum/src/components/Notification.js
+++ b/js/forum/src/components/Notification.js
@@ -19,18 +19,21 @@ export default class Notification extends Component {
     const href = this.href();
 
     return (
-      <div className={'Notification Notification--' + notification.contentType() + ' ' + (!notification.isRead() ? 'unread' : '')}
-        onclick={this.markAsRead.bind(this)}>
-        <a href={href} config={href.indexOf('://') === -1 ? m.route : undefined}>
-          {avatar(notification.sender())}
-          {icon(this.icon(), {className: 'Notification-icon'})}
-          <span className="Notification-content">{this.content()}</span>
-          {humanTime(notification.time())}
-          <div className="Notification-excerpt">
-            {this.excerpt()}
-          </div>
-        </a>
-      </div>
+      <a className={'Notification Notification--' + notification.contentType() + ' ' + (!notification.isRead() ? 'unread' : '')}
+        href={href}
+        config={function(element, isInitialized) {
+          if (href.indexOf('://') === -1) m.route.apply(this, arguments);
+
+          if (!isInitialized) $(element).click(this.markAsRead.bind(this));
+        }}>
+        {avatar(notification.sender())}
+        {icon(this.icon(), {className: 'Notification-icon'})}
+        <span className="Notification-content">{this.content()}</span>
+        {humanTime(notification.time())}
+        <div className="Notification-excerpt">
+          {this.excerpt()}
+        </div>
+      </a>
     );
   }