maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tweak onClick event

Browse source
This commit is contained in:
Johannes Rieken 2016-08-11 16:36:28 +02:00
parent 8db0a1558b
commit a740256d08
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/vs/base/browser/ui/actionbar/actionbar.css
View file

@ -24,11 +24,11 @@
.monaco-action-bar .action-item {
cursor: pointer;
display: inline-block;
-ms-transition: -ms-transform 80ms ease;
-webkit-transition: -webkit-transform 80ms ease;
-moz-transition: -moz-transform 80ms ease;
-o-transition: -o-transform 80ms ease;
transition: transform 80ms ease;
-ms-transition: -ms-transform 50ms ease;
-webkit-transition: -webkit-transform 50ms ease;
-moz-transition: -moz-transform 50ms ease;
-o-transition: -o-transform 50ms ease;
transition: transform 50ms ease;
position: relative; /* DO NOT REMOVE - this is the key to preventing the ghosting icon bug in Chrome 42 */
}

13
src/vs/base/browser/ui/actionbar/actionbar.ts
View file

@ -106,7 +106,6 @@ export class BaseActionItem extends EventEmitter implements IActionItem {
this.builder = $(container);
this.gesture = new Gesture(container);
this.builder.on(DOM.EventType.CLICK, (event: Event) => this.onClick(event));
this.builder.on(EventType.Tap, e => this.onClick(e));
if (platform.isMacintosh) {
@ -115,18 +114,18 @@ export class BaseActionItem extends EventEmitter implements IActionItem {
this.builder.on(DOM.EventType.MOUSE_DOWN, (e: MouseEvent) => {
DOM.EventHelper.stop(e);
if (e.button === 0 && this._action.enabled) {
if (this._action.enabled) {
this.builder.addClass('active');
}
});
this.builder.on(DOM.EventType.CLICK, (e: MouseEvent) => {
DOM.EventHelper.stop(event, true);
setTimeout(() => this.onClick(e), 50);
});
this.builder.on([DOM.EventType.MOUSE_UP, DOM.EventType.MOUSE_OUT], (e: MouseEvent) => {
DOM.EventHelper.stop(e);
if (e.button === 0 && this._action.enabled) {
this.builder.removeClass('active');
}
this.builder.removeClass('active');
});
}