ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-16 09:35:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.23.1 (#1520)

Browse Source
This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sql/base/browser/ui/table/table.ts
View File

@@ -12,7 +12,6 @@ import * as DOM from 'vs/base/browser/dom';
import { Color } from 'vs/base/common/color';
import { mixin } from 'vs/base/common/objects';
import { IDisposable } from 'vs/base/common/lifecycle';
import { Dimension } from 'vs/base/browser/builder';
import { Orientation } from 'vs/base/browser/ui/splitview/splitview';
import { Widget } from 'vs/base/browser/ui/widget';
@@ -136,7 +135,7 @@ export class Table<T extends Slick.SlickData> extends Widget implements IThemabl
onSelectedRowsChanged(fn: any): IDisposable {
this._grid.onSelectedRowsChanged.subscribe(fn);
return {
dispose() {
dispose: () => {
if (this._grid && this._grid.onSelectedRowsChanged) {
this._grid.onSelectedRowsChanged.unsubscribe(fn);
}
@@ -149,7 +148,7 @@ export class Table<T extends Slick.SlickData> extends Widget implements IThemabl
onContextMenu(fn: any): IDisposable {
this._grid.onContextMenu.subscribe(fn);
return {
dispose() {
dispose: () => {
this._grid.onContextMenu.unsubscribe(fn);
}
};
@@ -186,10 +185,10 @@ export class Table<T extends Slick.SlickData> extends Widget implements IThemabl
this._grid.resizeCanvas();
}
layout(dimension: Dimension): void;
layout(dimension: DOM.Dimension): void;
layout(size: number, orientation: Orientation): void;
layout(sizing: number | Dimension, orientation?: Orientation): void {
if (sizing instanceof Dimension) {
layout(sizing: number | DOM.Dimension, orientation?: Orientation): void {
if (sizing instanceof DOM.Dimension) {
this._container.style.width = sizing.width + 'px';
this._container.style.height = sizing.height + 'px';
this._tableContainer.style.width = sizing.width + 'px';

2
src/sql/base/browser/ui/table/tableDataView.ts
View File

@@ -5,7 +5,7 @@
import { Observable } from 'rxjs/Observable';
import { Observer } from 'rxjs/Observer';
import Event, { Emitter } from 'vs/base/common/event';
import { Event, Emitter } from 'vs/base/common/event';
import { TPromise } from 'vs/base/common/winjs.base';
import * as types from 'vs/base/common/types';