Merge branch 'master' into extension-viewlet

This commit is contained in:
Joao Moreno
2016-06-14 17:34:13 +02:00
1838 changed files with 135044 additions and 168356 deletions

View File

@@ -126,9 +126,15 @@ class Controller<T> implements IDisposable {
private view: ListView<T>
) {
this.toDispose = [];
this.toDispose.push(view.addListener('mousedown', e => this.onMouseDown(e)));
this.toDispose.push(view.addListener('click', e => this.onClick(e)));
}
private onMouseDown(e: IListMouseEvent<T>) {
e.preventDefault();
e.stopPropagation();
}
private onClick(e: IListMouseEvent<T>) {
e.preventDefault();
e.stopPropagation();
@@ -192,7 +198,7 @@ export class List<T> implements IDisposable {
}
get contentHeight(): number {
return this.view.getScrollHeight();
return this.view.getContentHeight();
}
get scrollTop(): number {