#22 - subset preview bug fix

minjk-bl · minjk-bl · commit 1f90a290746d · 2021-05-21T19:55:09.000+09:00
diff --git a/src/common/component/vpVarSelector.js b/src/common/component/vpVarSelector.js
@@ -137,7 +137,7 @@ define([
                 // render variable list
                 that.loadVariableList(varList);
             } catch (ex) {
-                console.log(ex);
+                // console.log(ex);
             }
         });
     }
diff --git a/src/common/vpSubsetEditor.js b/src/common/vpSubsetEditor.js
@@ -1626,32 +1626,37 @@ define([
 
         if (!this.codepreview) {
             // var previewTextarea = $('#vp_previewCode')[0];
-            var previewTextarea = $(this.wrapSelector('#vp_previewCode'))[0];
-            // if (wrappedTextarea) {
-            //     previewTextarea = wrappedTextarea;
+            // var previewTextarea = $(this.wrapSelector('#vp_previewCode'))[0];
+            var previewTextarea = $(this.wrapSelector('textarea'))[0];
+            // if (!previewTextarea) {
+            //     previewTextarea = $('#vp_previewCode')[0];
             // }
-            // set codemirror
-            this.codepreview = codemirror.fromTextArea(previewTextarea, {
-                mode: {
-                    name: 'python',
-                    version: 3,
-                    singleLineStringErrors: false
-                },  // text-cell(markdown cell) set to 'htmlmixed'
-                height: '100%',
-                width: '100%',
-                indentUnit: 4,
-                matchBrackets: true,
-                readOnly:true,
-                autoRefresh: true,
-                // lineWrapping: false, // text-cell(markdown cell) set to true
-                // indentWithTabs: true,
-                theme: "ipython",
-                extraKeys: {"Enter": "newlineAndIndentContinueMarkdownList"},
-                scrollbarStyle: "null"
-            });
-            this.setPreview('# Code Preview');
+            if (previewTextarea) {
+                // set codemirror
+                this.codepreview = codemirror.fromTextArea(previewTextarea, {
+                    mode: {
+                        name: 'python',
+                        version: 3,
+                        singleLineStringErrors: false
+                    },  // text-cell(markdown cell) set to 'htmlmixed'
+                    height: '100%',
+                    width: '100%',
+                    indentUnit: 4,
+                    matchBrackets: true,
+                    readOnly:true,
+                    autoRefresh: true,
+                    // lineWrapping: false, // text-cell(markdown cell) set to true
+                    // indentWithTabs: true,
+                    theme: "ipython",
+                    extraKeys: {"Enter": "newlineAndIndentContinueMarkdownList"},
+                    scrollbarStyle: "null"
+                });
+                this.setPreview('# Code Preview');
+                this.codepreview.refresh();
+            }
+        } else {
+            this.codepreview.refresh();
         }
-        this.codepreview.refresh();
 
         // reload pandasObject on open
         this.loadVariables();

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ define([`
`137`	`137`	`// render variable list`
`138`	`138`	`that.loadVariableList(varList);`
`139`	`139`	`} catch (ex) {`
`140`		`- console.log(ex);`
	`140`	`+ // console.log(ex);`
`141`	`141`	`}`
`142`	`142`	`});`
`143`	`143`	`}`