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

Fix webview editor height issue (#1808)

Browse Source
This commit is contained in:
Matt Irvine
2018-06-29 19:13:22 -07:00
committed by GitHub
parent 07fb58d5e1
commit 0cd47bc328
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sql/platform/dialog/dialogContainer.component.ts
View File

@@ -6,7 +6,7 @@
'use strict'; 'use strict';
import 'vs/css!./media/dialogModal'; import 'vs/css!./media/dialogModal';
import { Component, AfterContentInit, ViewChild, Input, Inject, forwardRef, ElementRef } from '@angular/core'; import { Component, ViewChild, Inject, forwardRef, ElementRef, AfterViewInit } from '@angular/core';
import { ModelViewContent } from 'sql/parts/modelComponents/modelViewContent.component'; import { ModelViewContent } from 'sql/parts/modelComponents/modelViewContent.component';
import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService';
import { DialogPane } from 'sql/platform/dialog/dialogPane'; import { DialogPane } from 'sql/platform/dialog/dialogPane';
@@ -24,7 +24,7 @@ export interface DialogComponentParams extends IBootstrapParams {
selector: 'dialog-modelview-container', selector: 'dialog-modelview-container',
providers: [], providers: [],
template: ` template: `
<div class="dialogContainer"> <div class="dialogContainer" *ngIf="_dialogPane && _dialogPane.displayPageTitle">
<div class="dialogModal-wizardHeader" *ngIf="_dialogPane && _dialogPane.displayPageTitle"> <div class="dialogModal-wizardHeader" *ngIf="_dialogPane && _dialogPane.displayPageTitle">
<div *ngIf="_dialogPane.pageNumber" class="wizardPageNumber">Step {{_dialogPane.pageNumber}}</div> <div *ngIf="_dialogPane.pageNumber" class="wizardPageNumber">Step {{_dialogPane.pageNumber}}</div>
<h1 class="wizardPageTitle">{{_dialogPane.title}}</h1> <h1 class="wizardPageTitle">{{_dialogPane.title}}</h1>
@@ -33,9 +33,11 @@ export interface DialogComponentParams extends IBootstrapParams {
<modelview-content [modelViewId]="modelViewId"> <modelview-content [modelViewId]="modelViewId">
</modelview-content> </modelview-content>
</div> </div>
<modelview-content [modelViewId]="modelViewId" *ngIf="!_dialogPane || !_dialogPane.displayPageTitle">
</modelview-content>
` `
}) })
export class DialogContainer implements AfterContentInit { export class DialogContainer implements AfterViewInit {
private _onResize = new Emitter<void>(); private _onResize = new Emitter<void>();
public readonly onResize: Event<void> = this._onResize.event; public readonly onResize: Event<void> = this._onResize.event;
private _dialogPane: DialogPane; private _dialogPane: DialogPane;
@@ -54,7 +56,7 @@ export class DialogContainer implements AfterContentInit {
this._dialogPane = this._params.dialogPane; this._dialogPane = this._params.dialogPane;
} }
ngAfterContentInit(): void { ngAfterViewInit(): void {
this._modelViewContent.onEvent(event => { this._modelViewContent.onEvent(event => {
if (event.isRootComponent && event.eventType === ComponentEventType.validityChanged) { if (event.isRootComponent && event.eventType === ComponentEventType.validityChanged) {
this._params.validityChangedCallback(event.args); this._params.validityChangedCallback(event.args);