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

Watch for on load event (#12309)

Browse Source
This commit is contained in:
Chris LaFreniere
2020-09-15 23:27:05 -07:00
committed by GitHub
parent 7e76f8cb20
commit ffb81d88fd
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/sql/workbench/contrib/notebook/browser/models/notebookInput.ts
View File

@@ -36,6 +36,7 @@ import { onUnexpectedError } from 'vs/base/common/errors';
import { INotification, INotificationService } from 'vs/platform/notification/common/notification';
import Severity from 'vs/base/common/severity';
import * as nls from 'vs/nls';
import { NotebookModel } from 'sql/workbench/services/notebook/browser/models/notebookModel';
export type ModeViewSaveHandler = (handle: number) => Thenable<boolean>;
@@ -87,6 +88,12 @@ export class NotebookEditorModel extends EditorModel {
let dirty = this.textEditorModel instanceof ResourceEditorModel ? false : this.textEditorModel.isDirty();
this.setDirty(dirty);
}));
this._register(this.textEditorModel.onDidLoad(async (e) => {
if (this.textEditorModel instanceof TextFileEditorModel) {
let model = this.getNotebookModel() as NotebookModel;
await model.loadContents(model.trustedMode, true);
}
}));
}
}
this._dirty = this.textEditorModel instanceof ResourceEditorModel ? false : this.textEditorModel.isDirty();

1
src/sql/workbench/contrib/notebook/browser/notebook.component.ts
View File

@@ -339,6 +339,7 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
this._register(model.onProviderIdChange((provider) => this.handleProviderIdChanged(provider)));
this._register(model.kernelChanged((kernelArgs) => this.handleKernelChanged(kernelArgs)));
this._register(model.onCellTypeChanged(() => this.detectChanges()));
this._register(model.layoutChanged(() => this.detectChanges()));
this._model = this._register(model);
await this._model.loadContents(trusted);
this.setLoading(false);

5
src/sql/workbench/services/notebook/browser/models/notebookModel.ts
View File

@@ -322,7 +322,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
return !ids ? [] : ids;
}
public async loadContents(isTrusted: boolean = false): Promise<void> {
public async loadContents(isTrusted = false, forceLayoutChange = false): Promise<void> {
try {
this._trustedMode = isTrusted;
@@ -369,6 +369,9 @@ export class NotebookModel extends Disposable implements INotebookModel {
if (this._cells.length === 0 || this._cells.every(cell => cell.cellType === CellTypes.Markdown)) {
this.trustedMode = true;
}
if (forceLayoutChange) {
this._layoutChanged.fire();
}
} catch (error) {
this._inErrorState = true;
throw error;