alugarius
diff --git a/‎src/client/jupyter/browser/main.ts‎
Lines changed: 8 additions & 2 deletions b/‎src/client/jupyter/browser/main.ts‎
Lines changed: 8 additions & 2 deletions
diff --git a/‎src/client/jupyter/display/resultView.ts‎
Lines changed: 3 additions & 1 deletion b/‎src/client/jupyter/display/resultView.ts‎
Lines changed: 3 additions & 1 deletion
@@ -29,14 +29,20 @@ function displayData(data: any, whiteBg: boolean): Promise<HTMLElement> {
     const results = (window as any).JUPYTER_DATA as any[];
     (window as any).__dirname = rootDirName;
     try {
-        const color = decodeURIComponent(window.location.search.substring(window.location.search.indexOf('?color=') + 7, window.location.search.indexOf('&fontFamily=')));
+        let color = decodeURIComponent(window.location.search.substring(window.location.search.indexOf('?color=') + 7));
+        color = color.substring(0, color.indexOf('&fontFamily='));
         if (color.length > 0) {
             window.document.body.style.color = color;
         }
-        const fontFamily = decodeURIComponent(window.location.search.substring(window.location.search.indexOf('&fontFamily=') + 12));
+        let fontFamily = decodeURIComponent(window.location.search.substring(window.location.search.indexOf('&fontFamily=') + 12));
+        fontFamily = fontFamily.substring(0, fontFamily.indexOf('&fontSize='));
         if (fontFamily.length > 0) {
             window.document.body.style.fontFamily = fontFamily;
         }
+        const fontSize = decodeURIComponent(window.location.search.substring(window.location.search.indexOf('&fontSize=') + 10));
+        if (fontSize.length > 0) {
+            window.document.body.style.fontSize = fontSize;
+        }
     }
     catch (ex) {
     }
 
@@ -142,14 +142,16 @@ export class TextDocumentContentProvider extends Disposable implements vscode.Te
                         function start(){
                             var color = '';
                             var fontFamily = '';
+                            var fontSize = '';
                             try {
                                 computedStyle = window.getComputedStyle(document.body);
                                 color = computedStyle.color + '';
                                 fontFamily = computedStyle.fontFamily;
+                                fontSize = computedStyle.fontSize;
                             }
                             catch(ex){
                             }
-                            document.getElementById('myframe').src="proxy.php?url=https%3A%2F%2Fgithub.com%2Falugarius%2FpythonVSCode%2Fcommit%2F%3Cspan+class%3D"pl-s1">${vscode.Uri.file(htmlFileName).toString()}?color=' + encodeURIComponent(color) + "&fontFamily=" + encodeURIComponent(fontFamily);
+                            document.getElementById('myframe').src="proxy.php?url=https%3A%2F%2Fgithub.com%2Falugarius%2FpythonVSCode%2Fcommit%2F%3Cspan+class%3D"pl-s1">${vscode.Uri.file(htmlFileName).toString()}?color=' + encodeURIComponent(color) + "&fontFamily=" + encodeURIComponent(fontFamily) + "&fontSize=" + encodeURIComponent(fontSize);
                         }
                     </script>
                     </head>
Original file line number	Diff line number	Diff line change
`@@ -29,14 +29,20 @@ function displayData(data: any, whiteBg: boolean): Promise<HTMLElement> {`
`29`	`29`	`const results = (window as any).JUPYTER_DATA as any[];`
`30`	`30`	`(window as any).__dirname = rootDirName;`
`31`	`31`	`try {`
`32`		`- const color = decodeURIComponent(window.location.search.substring(window.location.search.indexOf('?color=') + 7, window.location.search.indexOf('&fontFamily=')));`
	`32`	`+ let color = decodeURIComponent(window.location.search.substring(window.location.search.indexOf('?color=') + 7));`
	`33`	`+ color = color.substring(0, color.indexOf('&fontFamily='));`
`33`	`34`	`if (color.length > 0) {`
`34`	`35`	`window.document.body.style.color = color;`
`35`	`36`	`}`
`36`		`- const fontFamily = decodeURIComponent(window.location.search.substring(window.location.search.indexOf('&fontFamily=') + 12));`
	`37`	`+ let fontFamily = decodeURIComponent(window.location.search.substring(window.location.search.indexOf('&fontFamily=') + 12));`
	`38`	`+ fontFamily = fontFamily.substring(0, fontFamily.indexOf('&fontSize='));`
`37`	`39`	`if (fontFamily.length > 0) {`
`38`	`40`	`window.document.body.style.fontFamily = fontFamily;`
`39`	`41`	`}`
	`42`	`+ const fontSize = decodeURIComponent(window.location.search.substring(window.location.search.indexOf('&fontSize=') + 10));`
	`43`	`+ if (fontSize.length > 0) {`
	`44`	`+ window.document.body.style.fontSize = fontSize;`
	`45`	`+ }`
`40`	`46`	`}`
`41`	`47`	`catch (ex) {`
`42`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,14 +142,16 @@ export class TextDocumentContentProvider extends Disposable implements vscode.Te`
`142`	`142`	`function start(){`
`143`	`143`	`var color = '';`
`144`	`144`	`var fontFamily = '';`
	`145`	`+ var fontSize = '';`
`145`	`146`	`try {`
`146`	`147`	`computedStyle = window.getComputedStyle(document.body);`
`147`	`148`	`color = computedStyle.color + '';`
`148`	`149`	`fontFamily = computedStyle.fontFamily;`
	`150`	`+ fontSize = computedStyle.fontSize;`
`149`	`151`	`}`
`150`	`152`	`catch(ex){`
`151`	`153`	`}`
`152`		`- document.getElementById('myframe').src="proxy.php?url=https%3A%2F%2Fgithub.com%2Falugarius%2FpythonVSCode%2Fcommit%2F%3Cspan+class%3D"pl-s1">${vscode.Uri.file(htmlFileName).toString()}?color=' + encodeURIComponent(color) + "&fontFamily=" + encodeURIComponent(fontFamily);`
	`154`	`+ document.getElementById('myframe').src="proxy.php?url=https%3A%2F%2Fgithub.com%2Falugarius%2FpythonVSCode%2Fcommit%2F%3Cspan+class%3D"pl-s1">${vscode.Uri.file(htmlFileName).toString()}?color=' + encodeURIComponent(color) + "&fontFamily=" + encodeURIComponent(fontFamily) + "&fontSize=" + encodeURIComponent(fontSize);`
`153`	`155`	`}`
`154`	`156`	`</script>`
`155`	`157`	`</head>`