Merge branch 'master' into persistence

This commit is contained in:
Eugene Pankov
2018-12-21 20:04:49 +01:00
7 changed files with 33 additions and 4 deletions

View File

@@ -278,9 +278,9 @@ export class TerminalTabComponent extends BaseTabComponent {
let wheelDeltaY = 0
if ('wheelDeltaY' in event) {
wheelDeltaY = (event as MouseWheelEvent).wheelDeltaY
wheelDeltaY = (event as MouseWheelEvent)['wheelDeltaY']
} else {
wheelDeltaY = (event as MouseWheelEvent).deltaY
wheelDeltaY = (event as MouseWheelEvent)['deltaY']
}
if (event.ctrlKey || event.metaKey) {