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

Revert "Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)" (#5983)

Browse Source 
This reverts commit d15a3fcc98.
This commit is contained in:
Karl Burtram
2019-06-11 12:35:58 -07:00
committed by GitHub
parent 95a50b7892
commit 5a7562a37b
926 changed files with 11394 additions and 19540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/base/browser/ui/button/button.ts
View File

@@ -18,7 +18,7 @@ export class Button extends vsButton {
super(container, options);
this._register(DOM.addDisposableListener(this.element, DOM.EventType.FOCUS, () => {
this.element.style.outlineColor = this.buttonFocusOutline ? this.buttonFocusOutline.toString() : '';
this.element.style.outlineColor = this.buttonFocusOutline ? this.buttonFocusOutline.toString() : null;
this.element.style.outlineWidth = '1px';
}));

6
src/sql/base/browser/ui/dropdownList/dropdownList.ts
View File

@@ -41,11 +41,11 @@ export class DropdownList extends Dropdown {
if (action) {
this.button = new Button(_contentContainer);
this.button.label = action.label;
this._register(DOM.addDisposableListener(this.button.element, DOM.EventType.CLICK, () => {
this.toDispose.push(DOM.addDisposableListener(this.button.element, DOM.EventType.CLICK, () => {
action.run();
this.hide();
}));
this._register(DOM.addDisposableListener(this.button.element, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
this.toDispose.push(DOM.addDisposableListener(this.button.element, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
let event = new StandardKeyboardEvent(e);
if (event.equals(KeyCode.Enter)) {
e.stopPropagation();
@@ -75,7 +75,7 @@ export class DropdownList extends Dropdown {
}
}));
this._register(this._list.onSelectionChange(() => {
this.toDispose.push(this._list.onSelectionChange(() => {
// focus on the dropdown label then hide the dropdown list
this.element.focus();
this.hide();

12
src/sql/base/browser/ui/scrollableSplitview/scrollableSplitview.ts
View File

@@ -241,7 +241,7 @@ export class ScrollableSplitView extends HeightMap implements IDisposable {
}
this.onRemoveItems(new ArrayIterator([item.view.id!]));
});
const disposable = combinedDisposable(onChangeDisposable, containerDisposable);
const disposable = combinedDisposable([onChangeDisposable, containerDisposable]);
const onAdd = view.onAdd ? () => view.onAdd!() : () => { };
const onRemove = view.onRemove ? () => view.onRemove!() : () => { };
@@ -292,7 +292,7 @@ export class ScrollableSplitView extends HeightMap implements IDisposable {
const onEndDisposable = onEnd(this.onSashEnd, this);
const onDidResetDisposable = sash.onDidReset(() => this._onDidSashReset.fire(firstIndex(this.sashItems, item => item.sash === sash)));
const disposable = combinedDisposable(onStartDisposable, onChangeDisposable, onEndDisposable, onDidResetDisposable, sash);
const disposable = combinedDisposable([onStartDisposable, onChangeDisposable, onEndDisposable, onDidResetDisposable, sash]);
const sashItem: ISashItem = { sash, disposable };
this.sashItems.splice(currentIndex - 1, 0, sashItem);
@@ -344,7 +344,7 @@ export class ScrollableSplitView extends HeightMap implements IDisposable {
}
this.onRemoveItems(new ArrayIterator([item.view.id!]));
});
const disposable = combinedDisposable(onChangeDisposable, containerDisposable);
const disposable = combinedDisposable([onChangeDisposable, containerDisposable]);
const onAdd = view.onAdd ? () => view.onAdd!() : () => { };
const onRemove = view.onRemove ? () => view.onRemove!() : () => { };
@@ -395,7 +395,7 @@ export class ScrollableSplitView extends HeightMap implements IDisposable {
const onEndDisposable = onEnd(this.onSashEnd, this);
const onDidResetDisposable = sash.onDidReset(() => this._onDidSashReset.fire(firstIndex(this.sashItems, item => item.sash === sash)));
const disposable = combinedDisposable(onStartDisposable, onChangeDisposable, onEndDisposable, onDidResetDisposable, sash);
const disposable = combinedDisposable([onStartDisposable, onChangeDisposable, onEndDisposable, onDidResetDisposable, sash]);
const sashItem: ISashItem = { sash, disposable };
this.sashItems.splice(index - 1, 0, sashItem);
@@ -527,10 +527,10 @@ export class ScrollableSplitView extends HeightMap implements IDisposable {
const index = firstIndex(this.sashItems, item => item.sash === sash);
// This way, we can press Alt while we resize a sash, macOS style!
const disposable = combinedDisposable(
const disposable = combinedDisposable([
domEvent(document.body, 'keydown')(e => resetSashDragState(this.sashDragState.current, e.altKey)),
domEvent(document.body, 'keyup')(() => resetSashDragState(this.sashDragState.current, false))
);
]);
const resetSashDragState = (start: number, alt: boolean) => {
const sizes = this.viewItems.map(i => i.size);

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

@@ -14,7 +14,7 @@ const defaultOptions: IAutoColumnSizeOptions = {
autoSizeOnRender: false
};
export class AutoColumnSize<T extends Object> implements Slick.Plugin<T> {
export class AutoColumnSize<T> implements Slick.Plugin<T> {
private _grid: Slick.Grid<T>;
private _$container: JQuery;
private _context: CanvasRenderingContext2D;

5
src/sql/base/browser/ui/taskbar/actionbar.ts
View File

@@ -43,12 +43,13 @@ export class ActionBar extends ActionRunner implements IActionRunner {
super();
this._options = options;
this._context = options.context;
this._toDispose = [];
if (this._options.actionRunner) {
this._actionRunner = this._options.actionRunner;
} else {
this._actionRunner = new ActionRunner();
this._register(this._actionRunner);
this._toDispose.push(this._actionRunner);
}
//this._toDispose.push(this.addEmitter(this._actionRunner));
@@ -364,6 +365,8 @@ export class ActionBar extends ActionRunner implements IActionRunner {
lifecycle.dispose(this._items);
this._items = [];
this._toDispose = lifecycle.dispose(this._toDispose);
this._domNode.remove();
super.dispose();