Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try


# IDE / Code Editor configs
/.idea

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this added on purpose? Usually environment specific things like developers' IDEs make more sense in a global .gitignore

4 changes: 3 additions & 1 deletion addon/components/notification-message.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
},

Expand Down
4 changes: 2 additions & 2 deletions addon/templates/components/notification-message.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down