fixed displaying latex with iframes

DonJayamanne · DonJayamanne · commit 9bddcd735e2b · 2016-09-23T10:09:19.000+10:00
diff --git a/src/client/jupyter/browser/main.ts b/src/client/jupyter/browser/main.ts
@@ -4,8 +4,9 @@ const transformime = require('transformime');
 const MarkdownTransform = require('transformime-marked');
 const transform = transformime.createTransform([MarkdownTransform]) as Function;
 
-(window as any).initializeResults = () => {
+(window as any).initializeResults = (rootDirName) => {
     const data = (window as any).JUPYTER_DATA as any[];
+    const __dirname = rootDirName;
     data.forEach(data => {
         if (typeof data['text/html'] === 'string') {
             data['text/html'] = data['text/html'].replace(/<\/scripts>/g, '</script>');
diff --git a/src/client/jupyter/display/main.ts b/src/client/jupyter/display/main.ts
@@ -30,9 +30,7 @@ export class JupyterDisplay extends vscode.Disposable {
         this.displayed = true;
         return vscode.commands.executeCommand('vscode.previewHtml', previewUri, vscode.ViewColumn.Two, 'Results')
             .then(() => {
-                if (this.displayed) {
-                    this.previewWindow.update();
-                }
+                // Do nothing
             }, reason => {
                 vscode.window.showErrorMessage(reason);
             });
diff --git a/src/client/jupyter/display/resultView.ts b/src/client/jupyter/display/resultView.ts
@@ -51,56 +51,63 @@ export class TextDocumentContentProvider implements vscode.TextDocumentContentPr
                     width:100%;
                 }
                 </style>`;
+        // Don't put this, stuffs up SVG hrefs
+        // <basex href="${path.join(__dirname, '..', '..', '..', '..')}" target="_blank">
+        const dirNameForScripts = path.join(__dirname, '..', '..', '..', 'out');
         const html = `
+                <!DOCTYPE html>
+                <html>
                 <head>
                 </head>
-                <body onload="initializeResults()">
+                <body onload="initializeResults('')">
                     <script type="text/javascript">
                         window.JUPYTER_DATA = ${JSON.stringify(this.results)};
                     </script>
                     <script src="${this.getScriptFilePath('bundle.js')}?x=${new Date().getMilliseconds()}"></script>
                 </body>
+                </html>
             `;
         // fs.writeFileSync('/Users/donjayamanne/.vscode/extensions/pythonVSCode/results.html', html);
-        return Promise.resolve(html);
+        // return Promise.resolve(html);
 
-        // let htmlFile: helpers.Deferred<string> = helpers.createDeferred<string>();
-        // if (this.tmpHtmlFile) {
-        //     fs.exists(this.tmpHtmlFile, exists => {
-        //         if (exists) {
-        //             return htmlFile.resolve(this.tmpHtmlFile);
-        //         }
-        //         helpers.createTemporaryFile('.html').then(tmpFile => {
-        //             htmlFile.resolve(tmpFile.filePath);
-        //         });
-        //     });
-        // }
-        // else {
-        //     helpers.createTemporaryFile('.html').then(tmpFile => {
-        //         htmlFile.resolve(tmpFile.filePath);
-        //     });
-        // }
+        let htmlFile: helpers.Deferred<string> = helpers.createDeferred<string>();
+        if (this.tmpHtmlFile) {
+            fs.exists(this.tmpHtmlFile, exists => {
+                if (exists) {
+                    return htmlFile.resolve(this.tmpHtmlFile);
+                }
+                helpers.createTemporaryFile('.html').then(tmpFile => {
+                    htmlFile.resolve(tmpFile.filePath);
+                });
+            });
+        }
+        else {
+            helpers.createTemporaryFile('.html').then(tmpFile => {
+                htmlFile.resolve(tmpFile.filePath);
+            });
+        }
 
-        // return htmlFile.promise.then(htmlFileName => {
-        //     const htmlContent = `
-        //     <head>
-        //         <style type="text/css">
-        //         html, body{
-        //             height:100%;
-        //             width:100%;
-        //         }
-        //         </style>
-        //     </head>
-        //     <body><iframe frameborder="0" style="border: 0px solid white;height:100%;width:100%;" src="${htmlFileName}" seamless></iframe></body>`;
-        //     return new Promise<string>((resolve, reject) => {
-        //         fs.writeFile(htmlFileName, html, err => {
-        //             if (err) {
-        //                 return reject(err);
-        //             }
-        //             fs.writeFileSync('/Users/donjayamanne/.vscode/extensions/pythonVSCode/results.html', htmlContent);
-        //             resolve(htmlContent);
-        //         });
-        //     });
-        // });
+        return htmlFile.promise.then(htmlFileName => {
+            const htmlContent = `
+            <!DOCTYPE html>
+            <head>
+                <style type="text/css">
+                html, body{
+                    height:100%;
+                    width:100%;
+                }
+                </style>
+            </head>
+            <body><iframe frameborder="0" style="border: 0px solid white;height:100%;width:100%;" src="${vscode.Uri.file(htmlFileName).toString()}" seamless></iframe></body></html>`;
+            return new Promise<string>((resolve, reject) => {
+                fs.writeFile(htmlFileName, html, err => {
+                    if (err) {
+                        return reject(err);
+                    }
+                    // fs.writeFileSync('/Users/donjayamanne/.vscode/extensions/pythonVSCode/results.html', htmlContent);
+                    resolve(htmlContent);
+                });
+            });
+        });
     }
 }
