May 25, 2018 · Apr 23, 2018 · Apr 24, 2018 · Apr 25, 2018 · Apr 26, 2018 · Apr 27, 2018
diff --git a/packages/apputils/src/mainareawidget.ts b/packages/apputils/src/mainareawidget.ts
      layout.addWidget(spinner);
      // Make sure the ready promise is a Promise<void> to avoid leaking any
      // results.
      this._reveal = options.reveal.then(() => {
      this._revealed = options.reveal.then(() => {
        this._isRevealed = true;
        const active = document.activeElement === spinner.node;
        spinner.dispose();
      spinner.dispose();
      layout.addWidget(content);
      this._isRevealed = true;
      this._reveal = Promise.resolve(undefined);
      this._revealed = Promise.resolve(undefined);
    }
  }

  }

  /**
   * A promise that resolves when the widget isready to berevealed.
   * A promise that resolves when the widget is revealed.
   */
  getreveal(): Promise<void> {
    return this._reveal;
  getrevealed(): Promise<void> {
    return this._revealed;
  }

  /**
  private _spinner = new Spinner();

  private _isRevealed = false;
  private_reveal: Promise<void>;
  private_revealed: Promise<void>;
 }


diff --git a/packages/csvviewer/src/widget.ts b/packages/csvviewer/src/widget.ts

    this._context.ready.then(() => {
      this._updateGrid();
      this._reveal.resolve(undefined);
      this._revealed.resolve(undefined);
      // Throttle the rendering rate of the widget.
      this._monitor = new ActivityMonitor({
        signal: context.model.contentChanged,
  /**
   * A promise that resolves when the csv viewer is ready to be revealed.
   */
  getreveal() {
    return this._reveal.promise;
  getrevealed() {
    return this._revealed.promise;
  }

  /**
  private _grid: DataGrid;
  private _monitor: ActivityMonitor<any, any> | null = null;
  private _delimiter = ',';
  private_reveal = new PromiseDelegate<void>();
  private_revealed = new PromiseDelegate<void>();
 }


  constructor(options: CSVDocumentWidget.IOptions) {
    let {content, context, delimiter, reveal, ...other} = options;
    content = content || Private.createContent(context);
    reveal = Promise.all([reveal, content.reveal]);
    reveal = Promise.all([reveal, content.revealed]);
    super({content, context, reveal, ...other});

    if (delimiter) {
diff --git a/packages/docregistry/src/registry.ts b/packages/docregistry/src/registry.ts
  readonly content: T;

  /**
   * A promise resolvingwhen the content widget is ready to be revealed.
   * A promise resolvingafter the content widget is revealed.
   */
  readonlyreveal: Promise<void>;
  readonlyrevealed: Promise<void>;

  /**
   * The context associated with the document.
diff --git a/tests/test-docregistry/src/default.spec.ts b/tests/test-docregistry/src/default.spec.ts

    });

    describe('#reveal', () => {
    describe('#revealed', () => {
      beforeEach(setup);

      it('should resolve after the reveal and context ready promises', async () => {
        expect(widget.isRevealed).to.be(false);

        // Our promise should resolve before the widget reveal promise.
        expect(await Promise.race([widget.reveal, reveal])).to.be(x);
        expect(await Promise.race([widget.revealed, reveal])).to.be(x);
        // The context ready promise should also resolve first.
        context.initialize(true);
        expect(await Promise.race([widget.reveal, contextReady])).to.eql([undefined, x]);
        // The widget.reveal promise should finally resolve.
        expect(await widget.reveal).to.be(undefined);
        expect(await Promise.race([widget.revealed, contextReady])).to.eql([undefined, x]);
        // The widget.revealed promise should finally resolve.
        expect(await widget.revealed).to.be(undefined);
      });

    });
Original file line number	Diff line number	Diff line change
Expand Up		@@ -71,7 +71,7 @@ class MainAreaWidget<T extends Widget = Widget> extends Widget {
		layout.addWidget(spinner);
		// Make sure the ready promise is a Promise<void> to avoid leaking any
		// results.
		this._reveal = options.reveal.then(() => {
		this._revealed = options.reveal.then(() => {
		this._isRevealed = true;
		const active = document.activeElement === spinner.node;
		spinner.dispose();
Expand All		@@ -96,7 +96,7 @@ class MainAreaWidget<T extends Widget = Widget> extends Widget {
		spinner.dispose();
		layout.addWidget(content);
		this._isRevealed = true;
		this._reveal = Promise.resolve(undefined);
		this._revealed = Promise.resolve(undefined);
		}
		}

Expand All		@@ -118,10 +118,10 @@ class MainAreaWidget<T extends Widget = Widget> extends Widget {
		}

		/**
		* A promise that resolves when the widget isready to berevealed.
		* A promise that resolves when the widget is revealed.
		*/
		getreveal(): Promise<void> {
		return this._reveal;
		getrevealed(): Promise<void> {
		return this._revealed;
		}

		/**
Expand DownExpand Up		@@ -240,7 +240,7 @@ class MainAreaWidget<T extends Widget = Widget> extends Widget {
		private _spinner = new Spinner();

		private _isRevealed = false;
		private_reveal: Promise<void>;
		private_revealed: Promise<void>;
		}


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -72,7 +72,7 @@ class CSVViewer extends Widget {

		this._context.ready.then(() => {
		this._updateGrid();
		this._reveal.resolve(undefined);
		this._revealed.resolve(undefined);
		// Throttle the rendering rate of the widget.
		this._monitor = new ActivityMonitor({
		signal: context.model.contentChanged,
Expand All		@@ -92,8 +92,8 @@ class CSVViewer extends Widget {
		/**
		* A promise that resolves when the csv viewer is ready to be revealed.
		*/
		getreveal() {
		return this._reveal.promise;
		getrevealed() {
		return this._revealed.promise;
		}

		/**
Expand DownExpand Up		@@ -145,7 +145,7 @@ class CSVViewer extends Widget {
		private _grid: DataGrid;
		private _monitor: ActivityMonitor<any, any> \| null = null;
		private _delimiter = ',';
		private_reveal = new PromiseDelegate<void>();
		private_revealed = new PromiseDelegate<void>();
		}


Expand All		@@ -171,7 +171,7 @@ class CSVDocumentWidget extends DocumentWidget<CSVViewer> {
		constructor(options: CSVDocumentWidget.IOptions) {
		let {content, context, delimiter, reveal, ...other} = options;
		content = content \|\| Private.createContent(context);
		reveal = Promise.all([reveal, content.reveal]);
		reveal = Promise.all([reveal, content.revealed]);
		super({content, context, reveal, ...other});

		if (delimiter) {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1202,9 +1202,9 @@ interface IDocumentWidget<T extends Widget = Widget, U extends DocumentRegistry.
		readonly content: T;
Copy link Contributor blink1073May 22, 2018 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. These should have inline comments (especially "ready"). Copy link ContributorAuthor jasongroutMay 23, 2018 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. In documenting this promise, I say "A promise resolving when the content widget is ready to be revealed." Would "reveal" be a better name for the promise than "ready"? When the reveal promise resolves, then we reveal the document widget.

		/**
		* A promise resolvingwhen the content widget is ready to be revealed.
		* A promise resolvingafter the content widget is revealed.
		*/
		readonlyreveal: Promise<void>;
		readonlyrevealed: Promise<void>;

		/**
		* The context associated with the document.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -601,7 +601,7 @@ describe('docregistry/default', () => {

		});

		describe('#reveal', () => {
		describe('#revealed', () => {
		beforeEach(setup);

		it('should resolve after the reveal and context ready promises', async () => {
Expand All		@@ -612,12 +612,12 @@ describe('docregistry/default', () => {
		expect(widget.isRevealed).to.be(false);

		// Our promise should resolve before the widget reveal promise.
		expect(await Promise.race([widget.reveal, reveal])).to.be(x);
		expect(await Promise.race([widget.revealed, reveal])).to.be(x);
		// The context ready promise should also resolve first.
		context.initialize(true);
		expect(await Promise.race([widget.reveal, contextReady])).to.eql([undefined, x]);
		// The widget.reveal promise should finally resolve.
		expect(await widget.reveal).to.be(undefined);
		expect(await Promise.race([widget.revealed, contextReady])).to.eql([undefined, x]);
		// The widget.revealed promise should finally resolve.
		expect(await widget.revealed).to.be(undefined);
		});

		});
Expand Down