Merge pull request #158 from minjk-bl/devops

minjk-bl · web-flow · commit dda4eb5328be · 2022-08-05T15:08:23.000+09:00
Update for v2.2.9
diff --git a/css/menuFrame.css b/css/menuFrame.css
@@ -57,18 +57,18 @@
     padding: 0 5px 5px 5px;
     box-sizing: border-box;
 }
-.vp-menu-body > div:nth-child(2) {
+/* .vp-menu-body > div:nth-child(2) {
     margin-top: 50px;
-}
+} */
 .vp-menu-search-div {
     box-sizing: border-box;
     padding: 10px 0 10px 0px;
-    position: absolute;
-    width: calc(100% - 10px);
+    position: relative;
+    width: 100%;
     background: white;
 }
 .vp-menu-search-box {
-    width: calc(100% - 50px);
+    width: calc(100% - 45px);
     height: 30px;
     background: #FFFFFF;
     border: 0.25px solid #e4e4e4;
@@ -83,14 +83,14 @@
     width: 20px;
     height: 20px;
     position: relative;
-    right: 32px;
+    right: 30px;
 }
 .vp-board-toggle-icon {
     width: 26px;
     height: 26px;
     position: absolute;
     top: 11px;
-    right: 8px;
+    right: 4px;
     cursor: pointer;
     background-image: url(../img/toggleNote.svg);
     background-position: center;
@@ -105,6 +105,9 @@
 .vp-board-toggle-icon:hover {
     background-image: url(../img/toggleNote.svg);
 }
+.vp-menugroup-list {
+    height: calc(100% - 45px);
+}
 
 .vp-menu-footer {
     width: 100%;
diff --git a/html/menuFrame.html b/html/menuFrame.html
@@ -48,12 +48,15 @@
             </div>
         </div>
         <!-- Menu Body -->
-        <div id="vp_menuBody" class="vp-menu-body vp-scrollbar">
+        <div id="vp_menuBody" class="vp-menu-body">
             <div class="vp-menu-search-div">
                 <input id="vp_menuSearchBox" class="vp-input vp-menu-search-box" type="text" placeholder="Search">
                 <img class="vp-menu-search-icon" src="/nbextensions/visualpython/img/search.svg"/>
                 <div id="vp_toggleBoard" class="vp-board-toggle-icon" title="Show VP Note"></div>
             </div>
+            <div class="vp-menugroup-list vp-scrollbar">
+
+            </div>
         </div>
         <!-- Menu Footer -->
         <div id="vp_menuFooter" class="vp-menu-footer">
diff --git a/js/com/component/FileNavigation.js b/js/com/component/FileNavigation.js
@@ -402,9 +402,7 @@ define([
             $(this.wrapSelector('#vp_fileNavigationInput')).on('change', function() {
                 let fileName = $(this).val();
                 let filePath = that.getRelativePath(that.pathState.baseDir, that.pathState.currentPath);
-                if (filePath == '') {
-                    filePath = './' + fileName;
-                }
+                
                 that.handleSelectFile(filePath, fileName);
             });
             // bind save cancel event
diff --git a/js/m_apps/Frame.js b/js/m_apps/Frame.js
@@ -660,10 +660,10 @@ define([
                     // render variable list
                     // get prevvalue
                     var prevValue = that.state.originObj;
-                    if (varList && varList.length > 0 && prevValue == '') {
-                        prevValue = varList[0].varName;
-                        that.state.originObj = prevValue;
-                    }
+                    // if (varList && varList.length > 0 && prevValue == '') {
+                    //     prevValue = varList[0].varName;
+                    //     that.state.originObj = prevValue;
+                    // }
                     // replace
                     that.renderVariableList(varList, prevValue);
                     $(that.wrapSelector('#vp_feVariable')).trigger('change');
diff --git a/js/m_visualize/Seaborn.js b/js/m_visualize/Seaborn.js
@@ -712,7 +712,7 @@ define([
                 suggestInput.setComponentID('styleSheet');
                 suggestInput.setSuggestList(function() { return varList; });
                 suggestInput.setPlaceholder('style name');
-                suggestInput.setValue('seaborn-darkgrid'); // set default (seaborn-darkgrid)
+                // suggestInput.setValue('seaborn-darkgrid'); // set default (seaborn-darkgrid)
                 // suggestInput.setNormalFilter(false);
                 $(stylesheetTag).replaceWith(function() {
                     return suggestInput.toTagString();
diff --git a/js/menu/MenuFrame.js b/js/menu/MenuFrame.js
@@ -252,7 +252,7 @@ define([
             menuLibraries && menuLibraries.forEach(item => {
                 if (item.type == 'package') {
                     // packages : MenuGroup
-                    var menuGroup = new MenuGroup($('#vp_menuBody'), item);
+                    var menuGroup = new MenuGroup($('.vp-menugroup-list'), item);
                     if (item.item) {
                         that.renderMenuItem(menuGroup);
                     }
diff --git a/js/menu/MenuGroup.js b/js/menu/MenuGroup.js
@@ -39,6 +39,8 @@ define([
                         bodyTag.hide();
                     } else {
                         bodyTag.show();
+                        // scroll to view
+                        $(target)[0].scrollIntoView({behavior: "smooth", block: "start"});
                     }
                     evt.stopPropagation();
                 }

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ define([`
`252`	`252`	`menuLibraries && menuLibraries.forEach(item => {`
`253`	`253`	`if (item.type == 'package') {`
`254`	`254`	`// packages : MenuGroup`
`255`		`- var menuGroup = new MenuGroup($('#vp_menuBody'), item);`
	`255`	`+ var menuGroup = new MenuGroup($('.vp-menugroup-list'), item);`
`256`	`256`	`if (item.item) {`
`257`	`257`	`that.renderMenuItem(menuGroup);`
`258`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@ define([`
`39`	`39`	`bodyTag.hide();`
`40`	`40`	`} else {`
`41`	`41`	`bodyTag.show();`
	`42`	`+ // scroll to view`
	`43`	`+ $(target)[0].scrollIntoView({behavior: "smooth", block: "start"});`
`42`	`44`	`}`
`43`	`45`	`evt.stopPropagation();`
`44`	`46`	`}`