Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Cmd/Shift clicking links in the header was broken

This commit is contained in:
Robin Ward 2016-04-25 13:35:30 -04:00
parent 16c44971d9
commit 8bad3c0eb5
No known key found for this signature in database
GPG Key ID: 0E091E2B4ED1B83D
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/widgets/link.js.es6
View File

@ -70,6 +70,7 @@ export default createWidget('link', {
}, },
click(e) { click(e) {
if (e.isDefaultPrevented() || e.shiftKey || e.metaKey || e.ctrlKey) { return; }
e.preventDefault(); e.preventDefault();
if (this.attrs.action) { if (this.attrs.action) {

2
app/assets/javascripts/discourse/widgets/notification-item.js.es6
View File

@ -96,7 +96,9 @@ createWidget('notification-item', {
}, },
click(e) { click(e) {
if (e.isDefaultPrevented() || e.shiftKey || e.metaKey || e.ctrlKey) { return; }
e.preventDefault(); e.preventDefault();
this.attrs.set('read', true); this.attrs.set('read', true);
const id = this.attrs.id; const id = this.attrs.id;
Discourse.setTransientHeader("Discourse-Clear-Notifications", id); Discourse.setTransientHeader("Discourse-Clear-Notifications", id);