Browse Source

Updates for new mime model api

Steven Silvester 7 years ago
parent
commit
7e15fd410a

+ 0 - 1
packages/application/src/index.ts

@@ -67,7 +67,6 @@ class JupyterLab extends Application<ApplicationShell> {
       }
     };
     this.rendermime = new RenderMime({ linkHandler });
-    RenderMime.addDefaultFactories(this.rendermime);
 
     let registry = this.docRegistry = new DocumentRegistry();
     registry.addModelFactory(new TextModelFactory());

+ 5 - 4
packages/docregistry/src/default.ts

@@ -10,7 +10,7 @@ import {
 } from '@jupyterlab/services';
 
 import {
-  JSONValue, PromiseDelegate
+  JSONObject, JSONValue, PromiseDelegate
 } from '@phosphor/coreutils';
 
 import {
@@ -496,12 +496,13 @@ class MimeRenderer extends Widget implements DocumentRegistry.IReadyWidget {
   private _render(): Promise<void> {
     let context = this._context;
     let model = context.model;
-    let mimeModel = new MimeModel();
+    let data: JSONObject;
     if (this._dataType === 'string') {
-      mimeModel.data.set(this._mimeType, model.toString());
+      data[this._mimeType] = model.toString();
     } else {
-      mimeModel.data.set(this._mimeType, model.toJSON());
+      data[this._mimeType] = model.toJSON();
     }
+    let mimeModel = new MimeModel({ data });
     return this._renderer.renderModel(mimeModel);
   }
 

+ 2 - 2
packages/outputarea/src/model.ts

@@ -377,8 +377,8 @@ class OutputAreaModel implements IOutputAreaModel {
   private _createItem(options: IOutputModel.IOptions): IOutputModel {
     let factory = this.contentFactory;
     let item = factory.createOutputModel(options);
-    item.data.changed.connect(this._onGenericChange, this);
-    item.metadata.changed.connect(this._onGenericChange, this);
+    item.changed.connect(this._onGenericChange, this);
+    item.changed.connect(this._onGenericChange, this);
     return item;
   }