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

Merge from vscode aba87f135229c17c4624341b7a2499dcedafcb87 (#6430)

Browse Source 
* Merge from vscode aba87f135229c17c4624341b7a2499dcedafcb87

* fix compile errors
This commit is contained in:
Anthony Dresser
2019-07-18 18:32:57 -07:00
committed by GitHub
parent bf4815d364
commit ee3663c1cd
158 changed files with 3101 additions and 2361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/workbench/parts/dashboard/electron-browser/contents/webviewContent.component.ts
View File

@@ -18,7 +18,7 @@ import { AngularDisposable } from 'sql/base/browser/lifecycle';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import * as azdata from 'azdata';
import { WebviewElement } from 'vs/workbench/contrib/webview/electron-browser/webviewElement';
import { ElectronWebviewBasedWebview } from 'vs/workbench/contrib/webview/electron-browser/webviewElement';
@Component({
template: '',
@@ -33,7 +33,7 @@ export class WebviewContent extends AngularDisposable implements OnInit, IDashbo
public readonly onMessage: Event<string> = this._onMessage.event;
private _onMessageDisposable: IDisposable;
private _webview: WebviewElement;
private _webview: ElectronWebviewBasedWebview;
private _html: string;
constructor(
@@ -100,7 +100,7 @@ export class WebviewContent extends AngularDisposable implements OnInit, IDashbo
this._onMessageDisposable.dispose();
}
this._webview = this.instantiationService.createInstance(WebviewElement,
this._webview = this.instantiationService.createInstance(ElectronWebviewBasedWebview,
{},
{
allowScripts: true

6
src/sql/workbench/parts/dashboard/electron-browser/widgets/webview/webviewWidget.component.ts
View File

@@ -16,7 +16,7 @@ import { IDashboardWebview, IDashboardViewService } from 'sql/platform/dashboard
import * as azdata from 'azdata';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { WebviewElement } from 'vs/workbench/contrib/webview/electron-browser/webviewElement';
import { ElectronWebviewBasedWebview } from 'vs/workbench/contrib/webview/electron-browser/webviewElement';
interface IWebviewWidgetConfig {
id: string;
@@ -31,7 +31,7 @@ const selector = 'webview-widget';
export class WebviewWidget extends DashboardWidget implements IDashboardWidget, OnInit, IDashboardWebview {
private _id: string;
private _webview: WebviewElement;
private _webview: ElectronWebviewBasedWebview;
private _html: string;
private _onMessage = new Emitter<string>();
public readonly onMessage: Event<string> = this._onMessage.event;
@@ -99,7 +99,7 @@ export class WebviewWidget extends DashboardWidget implements IDashboardWidget,
this._onMessageDisposable.dispose();
}
this._webview = this.instantiationService.createInstance(WebviewElement,
this._webview = this.instantiationService.createInstance(ElectronWebviewBasedWebview,
{},
{
allowScripts: true,