changed dropdown to checkbox

DonJayamanne · DonJayamanne · commit 6426604c1dab · 2016-09-27T13:24:16.000+10:00
diff --git a/src/client/jupyter/browser/main.ts b/src/client/jupyter/browser/main.ts
@@ -11,17 +11,15 @@ function displayData(data: any, whiteBg: boolean): Promise<HTMLElement> {
         data['text/html'] = data['text/html'].replace(/<\/scripts>/g, '</script>');
     }
     return transform(data).then(result => {
+        const div = document.createElement('div');
+        div.style.display = 'block';
+        div.appendChild(result.el);
+
         // If dealing with images add them inside a div with white background
         if (whiteBg === true || Object.keys(data).some(key => key.startsWith('image/'))) {
-            const div = document.createElement('div');
             div.style.backgroundColor = 'white';
-            div.style.display = 'inline-block';
-            div.appendChild(result.el);
-            return container.appendChild(div);
-        }
-        else {
-            return container.appendChild(result.el);
         }
+        return container.appendChild(div);
     });
 }
 
@@ -50,11 +48,19 @@ function displayData(data: any, whiteBg: boolean): Promise<HTMLElement> {
     document.getElementById('clearResults').addEventListener('click', () => {
         document.getElementById(ResultsContainerId).innerHTML = '';
     });
-
+    
     try {
         if (typeof port === 'number' && port > 0) {
             var socket = (window as any).io.connect('http://localhost:' + port);
+            const displayStyleEle = document.getElementById('displayStyle') as HTMLInputElement;
+            displayStyleEle.addEventListener('click', () => {
+                socket.emit('appendResults', { append: displayStyleEle.checked });
+            });
+
             socket.on('results', (results: any[]) => {
+                if (displayStyleEle.checked !== true){
+                    document.getElementById(ResultsContainerId).innerHTML = '';
+                }
                 const promises = results.map(data => displayData(data, whiteBg));
                 Promise.all<HTMLElement>(promises).then(elements => {
                     // Bring the first item into view
@@ -70,10 +76,6 @@ function displayData(data: any, whiteBg: boolean): Promise<HTMLElement> {
             socket.on('clientExists', (data: any) => {
                 socket.emit('clientExists', { id: data.id });
             });
-            const displayStyleEle = document.getElementById('displayStyle') as HTMLSelectElement;
-            displayStyleEle.addEventListener('change', () => {
-                socket.emit('appendResults', { append: displayStyleEle.value });
-            });
         }
     }
     catch (ex) {
diff --git a/src/client/jupyter/display/main.ts b/src/client/jupyter/display/main.ts
@@ -27,8 +27,8 @@ export class JupyterDisplay extends vscode.Disposable {
         this.disposables.push(vscode.workspace.registerTextDocumentContentProvider(jupyterSchema, this.previewWindow));
         this.cellOptions = new CellOptions(cellCodeLenses, cellHighlightProvider);
         this.disposables.push(this.cellOptions);
-        this.server.on('appendResults', appendType => {
-            this.appendResults = appendType === 'append';
+        this.server.on('appendResults', appendResults => {
+            this.appendResults = appendResults === true;
         });
     }
 
@@ -38,10 +38,7 @@ export class JupyterDisplay extends vscode.Disposable {
         return this.server.start().then(port => {
             this.previewWindow.ServerPort = port;
             // If we need to append the results, then do so if we have any result windows open
-            let sendDataToResultView = Promise.resolve(false);
-            if (this.appendResults) {
-                sendDataToResultView = this.server.clientsConnected(2000);
-            }
+            let sendDataToResultView = this.server.clientsConnected(2000);
             return sendDataToResultView.then(clientConnected => {
                 // vscode.commands.executeCommand('_webview.openDevTools');
                 if (clientConnected) {
diff --git a/src/client/jupyter/display/resultView.ts b/src/client/jupyter/display/resultView.ts
@@ -93,10 +93,7 @@ export class TextDocumentContentProvider extends Disposable implements vscode.Te
                 </head>
                 <body onload="initializeResults('${dirNameForScripts}', ${this.serverPort})">
                     <div id="resultMenu">
-                        <select id="displayStyle">
-                            <option value="clear" ${this.appendResults ? '' : 'selected'}>Clear previous results</option>
-                            <option value="append" ${this.appendResults ? 'selected' : ''}>Append results</option>
-                        </select>
+                        <label><input id="displayStyle" type="checkbox" ${this.appendResults ? 'checked' : ''}>Append Results</label>
                         &nbsp;
                         <button id="clearResults">Clear Results</button>
                         <br>
