Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 17:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into alex/perf

Browse Source
This commit is contained in:
Alex Dima
2016-03-31 10:55:21 +02:00
parent 79eda2eaef 5dce83b9ed
commit ba875c3300
131 changed files with 690 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/editor/browser/controller/keyboardHandler.ts
+2 -2
View File
@@ -5,7 +5,7 @@
'use strict';
import Event, {Emitter} from 'vs/base/common/event';
import {Disposable, IDisposable, disposeAll} from 'vs/base/common/lifecycle';
import {Disposable, IDisposable, dispose} from 'vs/base/common/lifecycle';
import * as browser from 'vs/base/browser/browser';
import * as dom from 'vs/base/browser/dom';
import {IKeyboardEvent} from 'vs/base/browser/keyboardEvent';
@@ -275,7 +275,7 @@ export class KeyboardHandler extends ViewEventHandler implements IDisposable {
this.context.removeEventHandler(this);
this.textAreaHandler.dispose();
this.textArea.dispose();
this._toDispose = disposeAll(this._toDispose);
this._toDispose = dispose(this._toDispose);
}
private _getStrategy(): TextAreaStrategy {