ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-18 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode b7235954cf5c8ec4086a44262d38265552272a7a (#9607)

Browse Source 
* Merge from vscode b7235954cf5c8ec4086a44262d38265552272a7a

* fix hygiene
This commit is contained in:
Anthony Dresser
2020-03-13 14:03:27 -07:00
committed by GitHub
parent fd08943244
commit 3d6929e78f
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/platform/opener/browser/link.ts
View File

@@ -5,7 +5,7 @@
import { Event } from 'vs/base/common/event';
import { IOpenerService } from 'vs/platform/opener/common/opener';
import { $ } from 'vs/base/browser/dom';
import { $, EventHelper, EventLike } from 'vs/base/browser/dom';
import { domEvent } from 'vs/base/browser/event';
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
import { KeyCode } from 'vs/base/common/keyCodes';
@@ -46,9 +46,12 @@ export class Link extends Disposable {
.map(e => new StandardKeyboardEvent(e))
.filter(e => e.keyCode === KeyCode.Enter)
.event;
const onOpen = Event.any(onClick, onEnterPress);
const onOpen = Event.any<EventLike>(onClick, onEnterPress);
this._register(onOpen(_ => openerService.open(link.href)));
this._register(onOpen(e => {
EventHelper.stop(e, true);
openerService.open(link.href);
}));
this.applyStyles();
}

5
src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
View File

@@ -152,7 +152,10 @@ class NotificationMessageRenderer {
const anchor = $('a', { href: node.href, title: title, }, node.label);
if (actionHandler) {
actionHandler.toDispose.add(addDisposableListener(anchor, EventType.CLICK, () => actionHandler.callback(node.href)));
actionHandler.toDispose.add(addDisposableListener(anchor, EventType.CLICK, e => {
EventHelper.stop(e, true);
actionHandler.callback(node.href);
}));
}
messageContainer.appendChild(anchor);