mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-01-21 01:25:37 -05:00
Vscode merge (#4582)
* Merge from vscode 37cb23d3dd4f9433d56d4ba5ea3203580719a0bd * fix issues with merges * bump node version in azpipe * replace license headers * remove duplicate launch task * fix build errors * fix build errors * fix tslint issues * working through package and linux build issues * more work * wip * fix packaged builds * working through linux build errors * wip * wip * wip * fix mac and linux file limits * iterate linux pipeline * disable editor typing * revert series to parallel * remove optimize vscode from linux * fix linting issues * revert testing change * add work round for new node * readd packaging for extensions * fix issue with angular not resolving decorator dependencies
This commit is contained in:
@@ -1377,7 +1377,7 @@ export const $: QuickBuilder = function (arg?: any): Builder {
|
||||
if (arg[0] === '<') {
|
||||
let element: Node;
|
||||
let container = document.createElement('div');
|
||||
container.innerHTML = strings.format.apply(strings, arguments);
|
||||
container.innerHTML = strings.format.apply(strings, <[string, ...any[]]>(<any>arguments));
|
||||
|
||||
if (container.children.length === 0) {
|
||||
throw new Error('Bad use of $');
|
||||
@@ -1426,10 +1426,10 @@ export const $: QuickBuilder = function (arg?: any): Builder {
|
||||
// Use the arguments as the arguments to Builder#element(...)
|
||||
else {
|
||||
let result = offDOM();
|
||||
result.element.apply(result, arguments);
|
||||
result.element.apply(result, <[string, any?, ((builder: Builder) => void)?]>(<any>arguments));
|
||||
return result;
|
||||
}
|
||||
} else {
|
||||
throw new Error('Bad use of $');
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
@@ -199,11 +199,6 @@ export class TabbedPanel extends Disposable implements IThemable {
|
||||
this.showTab(lastTab);
|
||||
}
|
||||
}
|
||||
|
||||
// this shouldn't happen but just in case
|
||||
if (this._shownTab === undefined && this._tabMap.size > 0) {
|
||||
this.showTab(this._tabMap.keys().next().value);
|
||||
}
|
||||
}
|
||||
|
||||
if (!this.options.showHeaderWhenSingleView && this._tabMap.size === 1 && this._headerVisible) {
|
||||
|
||||
Reference in New Issue
Block a user