From 2bedeca62b69eab42ff8ed5e9e353a13e3fd4ab2 Mon Sep 17 00:00:00 2001
From: Shajahan <shajansheriff@gmail.com>
Date: Thu, 26 Mar 2020 19:35:47 +0530
Subject: [PATCH] Fix[269] click event on links in notification message

---
 .gitignore                                          | 4 ++++
 addon/components/notification-message.js            | 4 +++-
 addon/templates/components/notification-message.hbs | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index c40a1b2a..96d6a0fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,7 @@
 /.node_modules.ember-try/
 /bower.json.ember-try
 /package.json.ember-try
+
+
+# IDE / Code Editor configs
+/.idea
diff --git a/addon/components/notification-message.js b/addon/components/notification-message.js
index 4d2c3837..585e87a7 100644
--- a/addon/components/notification-message.js
+++ b/addon/components/notification-message.js
@@ -63,7 +63,9 @@ export default Component.extend({
       }
     },
 
-    removeNotification() {
+    removeNotification(e) {
+      // clicking the notification close should not call the `onClick` callback defined on the notification message
+      e.stopPropagation();
       this.get('notifications').removeNotification(this.get('notification'));
     },
 
diff --git a/addon/templates/components/notification-message.hbs b/addon/templates/components/notification-message.hbs
index 87f007a6..8f741a08 100644
--- a/addon/templates/components/notification-message.hbs
+++ b/addon/templates/components/notification-message.hbs
@@ -8,13 +8,13 @@
       </svg>
     {{/if}}
   </div>
-  <div class="c-notification__content" {{action "handleOnClick"}}>
+  <div class="c-notification__content" {{on "click" (action "handleOnClick")}}>
     {{#if notification.htmlContent}}
       {{{notification.message}}}
     {{else}}
       {{notification.message}}
     {{/if}}
-    <div class="c-notification__close" {{action "removeNotification" bubbles=false}} title="Dismiss this notification">
+    <div class="c-notification__close" {{on "click" (action "removeNotification" bubbles=false)}} title="Dismiss this notification">
       <svg class="c-notification__svg" name="close" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 26 26" width="1024" height="1024" fill="#FFF"><path d="M21.734 19.64l-2.097 2.094a.983.983 0 0 1-1.395 0L13 16.496l-5.238 5.238a.988.988 0 0 1-1.399 0l-2.097-2.093a.988.988 0 0 1 0-1.399L9.504 13 4.266 7.762a.995.995 0 0 1 0-1.399l2.097-2.097a.988.988 0 0 1 1.399 0L13 9.508l5.242-5.242a.983.983 0 0 1 1.395 0l2.097 2.093a.996.996 0 0 1 .004 1.403L16.496 13l5.238 5.242a.988.988 0 0 1 0 1.399z"/></svg>
     </div>
   </div>