Rollback deleted useFile checkbox to WordCloud

minjk-bl · minjk-bl · commit 6b17531e9ac4 · 2022-06-07T17:05:23.000+09:00
diff --git a/html/m_visualize/wordCloud.html b/html/m_visualize/wordCloud.html
@@ -13,9 +13,12 @@
                 <div class="vp-tab-page-box vp-grid-border-box vp-scrollbar">
                     <div class="vp-tab-page vp-grid-box" data-type="data">
                         <label for="data" class="vp-bold">Data</label>
-                        <div>
-                            <input type="text" id="data" class="vp-input vp-state"/>
-                            <div id="vp_wcOpenFile" class="vp-file-browser-button" style="margin-left:0px;"></div>
+                        <div class="vp-grid-col-p50">
+                            <div>
+                                <input type="text" id="data" class="vp-input vp-state"/>
+                                <div id="vp_wcOpenFile" class="vp-file-browser-button"></div>
+                            </div>
+                            <label><input type="checkbox" id="useFile" class="vp-state"><span>Use file</span></label>
                         </div>
 
                         <div class="vp-wc-file-option vp-grid-box">
@@ -51,6 +54,9 @@
         <div class="vp-wc-right-box">
             <div class="vp-bold">
                 <span class="vp-wc-preview-title">Preview</span>
+                <span id="previewRefresh" class="vp-cursor">
+                    <img src="/nbextensions/visualpython/img/refresh.svg"/>
+                </span>
             </div>
             <div class="vp-wc-preview-box vp-grid-border-box">
                 <div id="vp_wcPreview" class="vp-wc-preview-content vp-center"></div>
diff --git a/js/m_visualize/WordCloud.js b/js/m_visualize/WordCloud.js
@@ -62,6 +62,8 @@ define([
 
                         that.state.useFile = true;
                         $(that.wrapSelector('.vp-wc-file-option')).show();
+                        $(that.wrapSelector('#useFile')).prop('checked', true);
+                        $(that.wrapSelector('#useFile')).trigger('change');
 
                         // set text
                         $(that.wrapSelector('#data')).val(path);
@@ -71,6 +73,16 @@ define([
                 fileNavi.open();
             });
 
+            // use file
+            $(this.wrapSelector('#useFile')).on('change', function() {
+                let checked = $(this).prop('checked');
+                if (checked) {
+                    $(that.wrapSelector('.vp-wc-file-option')).show();
+                } else {
+                    $(that.wrapSelector('.vp-wc-file-option')).hide();
+                }
+            });
+
             // change tab
             $(this.wrapSelector('.vp-tab-item')).on('click', function() {
                 let type = $(this).data('type'); // data / wordcloud / plot
@@ -91,6 +103,11 @@ define([
                 }
                 evt.stopPropagation();
             });
+            
+            // preview refresh
+            $(this.wrapSelector('#previewRefresh')).on('click', function() {
+                that.loadPreview();
+            });
 
         }
 
@@ -157,12 +174,16 @@ define([
                 pageThis: this,
                 id: 'data',
                 select: function() {
-                    that.state.useFile = false;
-                    $(that.wrapSelector('.vp-wc-file-option')).hide();
+                    // that.state.useFile = false;
+                    $(that.wrapSelector('#useFile')).prop('checked', false);
+                    $(that.wrapSelector('#useFile')).trigger('change');
+                    // $(that.wrapSelector('.vp-wc-file-option')).hide();
                 },
                 finish: function() {
-                    that.state.useFile = false;
-                    $(that.wrapSelector('.vp-wc-file-option')).hide();
+                    // that.state.useFile = false;
+                    $(that.wrapSelector('#useFile')).prop('checked', false);
+                    $(that.wrapSelector('#useFile')).trigger('change');
+                    // $(that.wrapSelector('.vp-wc-file-option')).hide();
                 }
             });
             $(this.wrapSelector('#data')).replaceWith(dataSelector.toTagString());
@@ -201,6 +222,7 @@ define([
                 suggestInput.addClass('vp-input vp-state');
                 suggestInput.setSuggestList(function() { return encodingList; });
                 suggestInput.setPlaceholder('encoding option');
+                suggestInput.setValue(that.state.encoding);
                 return suggestInput.toTagString();
             });
 
