Jelajahi Sumber

Fix rendering.

Afshin Darian 8 tahun lalu
induk
melakukan
cebec3f5b8
2 mengubah file dengan 6 tambahan dan 10 penghapusan
  1. 0 3
      src/notebook/output-area/model.ts
  2. 6 7
      src/notebook/output-area/widget.ts

+ 0 - 3
src/notebook/output-area/model.ts

@@ -197,7 +197,6 @@ class OutputAreaModel implements IDisposable {
         case 'error':
           let model = msg.content as nbformat.IOutput;
           model.output_type = msgType as nbformat.OutputType;
-          console.log('ONE model', model);
           this.add(model);
           break;
         case 'clear_output':
@@ -212,7 +211,6 @@ class OutputAreaModel implements IDisposable {
         let msgType = msg.header.msg_type;
         switch (msgType) {
         case 'execute_reply':
-          console.log('reply msg', msg);
           let content = msg.content as KernelMessage.IExecuteOkReply;
           let payload = content && content.payload;
           if (!payload) {
@@ -228,7 +226,6 @@ class OutputAreaModel implements IDisposable {
             data: (page as any).data as nbformat.MimeBundle,
             metadata: {}
           };
-          console.log('TWO model', model);
           this.add(model);
           break;
         default:

+ 6 - 7
src/notebook/output-area/widget.ts

@@ -737,27 +737,22 @@ class OutputWidget extends Widget {
       this.setOutput(child);
       return;
     }
-    console.log('rendering...');
     // Extract the data from the output and sanitize if necessary.
     let rendermime = this._rendermime;
     let bundle = this.getBundle(output as nbformat.IOutput);
     let data = this.convertBundle(bundle);
-
     // Clear the content.
     this.clear();
 
     // Bail if no data to display.
-    let msg = 'Did not find renderer for output mimebundle.';
     if (!data) {
-      console.log('no data in', msg);
+      console.warn('Did not find renderer for output mimebundle.');
       return;
     }
 
     // Create the output result area.
     let child = rendermime.render({ bundle: data, trusted, injector });
     if (!child) {
-      console.log('no child', msg);
-      console.log('\tdata', data);
       return;
     }
     this.setOutput(child);
@@ -823,6 +818,7 @@ class OutputWidget extends Widget {
   protected getBundle(output: nbformat.IOutput): nbformat.MimeBundle {
     let bundle: nbformat.MimeBundle;
     switch (output.output_type) {
+    case 'execute_reply':
     case 'execute_result':
       bundle = (output as nbformat.IExecuteResult).data;
       break;
@@ -830,8 +826,9 @@ class OutputWidget extends Widget {
       bundle = (output as nbformat.IDisplayData).data;
       break;
     case 'stream':
+      let text = (output as nbformat.IStream).text;
       bundle = {
-        'application/vnd.jupyter.console-text': (output as nbformat.IStream).text
+        'application/vnd.jupyter.console-text': text
       };
       break;
     case 'error':
@@ -842,6 +839,8 @@ class OutputWidget extends Widget {
           `${out.ename}: ${out.evalue}`
       };
       break;
+    default:
+      break;
     }
     return bundle || {};
   }