ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-24 17:23:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from master

Browse Source
This commit is contained in:
Raj Musuku
2019-02-21 17:56:04 -08:00
parent 5a146e34fa
commit 666ae11639
11482 changed files with 119352 additions and 255574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/base/browser/ui/table/plugins/headerFilter.plugin.ts
View File

@@ -20,7 +20,7 @@ export class HeaderFilter {
sortDescImage: 'sort-desc.gif'
};
private $menu;
private $menu: JQuery<HTMLElement>;
private options: any;
private okButton: Button;
private clearButton: Button;

8
src/sql/base/browser/ui/table/plugins/mousewheelTableScroll.plugin.ts
View File

@@ -7,7 +7,7 @@
import * as DOM from 'vs/base/browser/dom';
import * as Platform from 'vs/base/common/platform';
import { StandardMouseWheelEvent } from 'vs/base/browser/mouseEvent';
import { StandardWheelEvent, IMouseWheelEvent } from 'vs/base/browser/mouseEvent';
import { dispose, IDisposable } from 'vs/base/common/lifecycle';
import { mixin } from 'vs/base/common/objects';
@@ -36,15 +36,15 @@ export class MouseWheelSupport implements Slick.Plugin<any> {
public init(grid: Slick.Grid<any>): void {
this.canvas = grid.getCanvasNode();
this.viewport = this.canvas.parentElement;
let onMouseWheel = (browserEvent: MouseWheelEvent) => {
let e = new StandardMouseWheelEvent(browserEvent);
let onMouseWheel = (browserEvent: IMouseWheelEvent) => {
let e = new StandardWheelEvent(browserEvent);
this._onMouseWheel(e);
};
this._disposables.push(DOM.addDisposableListener(this.viewport, 'mousewheel', onMouseWheel));
this._disposables.push(DOM.addDisposableListener(this.viewport, 'DOMMouseScroll', onMouseWheel));
}
private _onMouseWheel(e: StandardMouseWheelEvent) {
private _onMouseWheel(e: StandardWheelEvent) {
if (e.deltaY || e.deltaX) {
let deltaY = e.deltaY * this.options.scrollSpeed;
let deltaX = e.deltaX * this.options.scrollSpeed;

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

@@ -6,6 +6,7 @@
import 'vs/css!./media/table';
import { TableDataView } from './tableDataView';
import { IDisposableDataProvider, ITableSorter, ITableMouseEvent, ITableConfiguration, ITableStyles } from 'sql/base/browser/ui/table/interfaces';
import { $ } from 'sql/base/browser/builder';
import { IThemable } from 'vs/platform/theme/common/styler';
import * as DOM from 'vs/base/browser/dom';
@@ -16,7 +17,6 @@ import { Widget } from 'vs/base/browser/ui/widget';
import { isArray, isBoolean } from 'vs/base/common/types';
import { Event, Emitter } from 'vs/base/common/event';
import { range } from 'vs/base/common/arrays';
import { $ } from 'vs/base/browser/builder';
function getDefaultOptions<T>(): Slick.GridOptions<T> {
return <Slick.GridOptions<T>>{
@@ -38,7 +38,7 @@ export class Table<T extends Slick.SlickData> extends Widget implements IThemabl
private _container: HTMLElement;
private _tableContainer: HTMLElement;
private _classChangeTimeout: number;
private _classChangeTimeout: NodeJS.Timer;
private _onContextMenu = new Emitter<ITableMouseEvent>();
public readonly onContextMenu: Event<ITableMouseEvent> = this._onContextMenu.event;