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

Merge from vscode 6e530127a1bb8ffbd1bfb77dc680c321dc0d71f5 (#6844)

Browse Source
This commit is contained in:
Anthony Dresser
2019-08-20 21:07:47 -07:00
committed by GitHub
parent 1f00249646
commit ecb80f14f0
221 changed files with 3140 additions and 1552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/workbench/browser/modelComponents/webview.component.ts
View File

@@ -14,7 +14,7 @@ import { URI, UriComponents } from 'vs/base/common/uri';
import { IOpenerService } from 'vs/platform/opener/common/opener';
import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
import { IContextKey } from 'vs/platform/contextkey/common/contextkey';
import { WebviewContentOptions, IWebviewService, WebviewElement } from 'vs/workbench/contrib/webview/common/webview';
import { WebviewContentOptions, IWebviewService, WebviewElement } from 'vs/workbench/contrib/webview/browser/webview';
import { generateUuid } from 'vs/base/common/uuid';
import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase';

4
src/sql/workbench/browser/parts/views/customView.ts
View File

@@ -76,7 +76,9 @@ export class CustomTreeViewPanel extends ViewletPanel {
}
renderBody(container: HTMLElement): void {
this.treeView.show(container);
if (this.treeView instanceof CustomTreeView) {
this.treeView.show(container);
}
}
layoutBody(height: number, width: number): void {

2
src/sql/workbench/parts/dashboard/browser/contents/webviewContent.component.ts
View File

@@ -17,7 +17,7 @@ import { IDashboardWebview, IDashboardViewService } from 'sql/platform/dashboard
import { AngularDisposable } from 'sql/base/browser/lifecycle';
import * as azdata from 'azdata';
import { WebviewElement, IWebviewService } from 'vs/workbench/contrib/webview/common/webview';
import { WebviewElement, IWebviewService } from 'vs/workbench/contrib/webview/browser/webview';
@Component({
template: '',

2
src/sql/workbench/parts/dashboard/browser/widgets/webview/webviewWidget.component.ts
View File

@@ -15,7 +15,7 @@ import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonSer
import { IDashboardWebview, IDashboardViewService } from 'sql/platform/dashboard/common/dashboardViewService';
import * as azdata from 'azdata';
import { WebviewElement, IWebviewService } from 'vs/workbench/contrib/webview/common/webview';
import { WebviewElement, IWebviewService } from 'vs/workbench/contrib/webview/browser/webview';
interface IWebviewWidgetConfig {
id: string;

2
src/sql/workbench/parts/webview/browser/webViewDialog.ts
View File

@@ -18,7 +18,7 @@ import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
import * as DOM from 'vs/base/browser/dom';
import { ILogService } from 'vs/platform/log/common/log';
import { IWebviewService, WebviewElement } from 'vs/workbench/contrib/webview/common/webview';
import { IWebviewService, WebviewElement } from 'vs/workbench/contrib/webview/browser/webview';
import { generateUuid } from 'vs/base/common/uuid';
import { ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration';