Преглед на файлове

Merge pull request #40 from blink1073/update-handler-interface

Update handler interface
Jason Grout преди 9 години
родител
ревизия
ef7e870974
променени са 4 файла, в които са добавени 17 реда и са изтрити 6 реда
  1. 1 1
      package.json
  2. 1 1
      scripts/travis_script.sh
  3. 10 3
      src/imagehandler/plugin.ts
  4. 5 1
      src/notebook/plugin.ts

+ 1 - 1
package.json

@@ -6,7 +6,7 @@
   "typings": "lib/index.d.ts",
   "dependencies": {
     "codemirror": "^5.10.0",
-    "jupyter-js-filebrowser": "^0.4.7",
+    "jupyter-js-filebrowser": "^0.4.9",
     "jupyter-js-notebook": "^0.3.2",
     "jupyter-js-services": "^0.4.1",
     "jupyter-js-terminal": "^0.1.12",

+ 1 - 1
scripts/travis_script.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 export DISPLAY=:99.0
-sh -e /etc/init.d/xvfb start
+sh -e /etc/init.d/xvfb start || true
 
 npm run clean
 npm run build

+ 10 - 3
src/imagehandler/plugin.ts

@@ -76,9 +76,9 @@ class ImageHandler extends AbstractFileHandler {
   }
 
  /**
-   * Populate a widget from `IContentsModel`.
-   */
-  protected populateWidget(widget: Widget, model: IContentsModel): Promise<void> {
+  * Populate a widget from `IContentsModel`.
+  */
+  protected setState(widget: Widget, model: IContentsModel): Promise<void> {
     return new Promise<void>((resolve, reject) => {
       let img = widget.node.firstChild as HTMLImageElement;
       img.addEventListener('load', () => {
@@ -90,4 +90,11 @@ class ImageHandler extends AbstractFileHandler {
       img.src = `data:${model.mimetype};${model.format},${model.content}`;;
     });
   }
+
+  /**
+   * Get the state of the Widget, returns `undefined`.
+   */
+  protected getState(widget: Widget): Promise<IContentsModel> {
+    return Promise.resolve(void 0);
+  }
 }

+ 5 - 1
src/notebook/plugin.ts

@@ -80,11 +80,15 @@ class NotebookFileHandler extends AbstractFileHandler {
   }
 
 
-  protected populateWidget(widget: NotebookWidget, model: IContentsModel): Promise<void> {
+  protected setState(widget: NotebookWidget, model: IContentsModel): Promise<void> {
     let nbdata: NBData = makedata(model);
     populateNotebookModel(widget.model, nbdata);
     return Promise.resolve();
   }
+
+  protected getState(widget: NotebookWidget): Promise<IContentsModel> {
+    return Promise.resolve(void 0);
+  }
 }
 
 function makedata(a: IContentsModel): NBData {