Fix FileNavigation

minjk-bl · minjk-bl · commit d4d9e26c0b9f · 2022-02-03T18:03:16.000+09:00
diff --git a/js/com/component/FileNavigation.js b/js/com/component/FileNavigation.js
@@ -222,7 +222,7 @@ define([
         
                     that.getFileList(dirObj);
                 } else {
-                    let dirPath = that.makeNewCurrRelativePath();
+                    let dirPath = that.getRelativePath(that.pathState.baseDir, that.pathState.currentPath);
                     let extension = name.substring(name.lastIndexOf('.') + 1);
                     let allowExtensionList = that.state.extensions;
                     // if it is not allowed extension
@@ -642,49 +642,6 @@ define([
             }
         }
 
-        /**
-         * Make relative path using current path
-         * @returns 
-         */
-        makeNewCurrRelativePath() {
-            var pathState = this.pathState;
-            var dirPath = pathState.relativeDir;
-            /** 
-             * current path on opening file navigation
-             *  ex) if current path is 'C:/Users/VP/Desktop/Test'
-             *      baseFolder = 'Test'
-             */
-            var baseFolder = pathState.baseFolder;
-            /** 
-             * base folder for jupyter notebook
-             *  ex) if current path is 'C:/Users/VP/Desktop/Test'
-             *      Jupyter.notebook.notebook_path = 'Desktop/Test/Untitled.ipynb'
-             *      notebookFolder = 'Desktop'
-             */
-            var noteBookFolder = pathState.notebookFolder;
-    
-    
-            /** if baseFolder is included in current relative path */
-            if (dirPath.indexOf(baseFolder) !== -1) {
-                var baseFolderIndex = dirPath.indexOf(baseFolder);
-                dirPath = dirPath.substring(baseFolderIndex,dirPath.length);
-                dirPath = dirPath.replace(baseFolder, '');
-            }
-            
-            /**  
-             * if baseFolder is same with noteBookFolder,
-             * not replacing notebookFolder inside dirPath
-             * */
-            if (baseFolder !== noteBookFolder) {
-                dirPath = dirPath.replace(noteBookFolder, '');
-            }
-    
-            if (dirPath[0] === '/') {
-                dirPath = dirPath.substring(1, dirPath.length);
-            }
-            return dirPath;
-        }
-
         splitPathStrAndSetStack(dirObj, resultInfoArr){
             var currentDirStr = resultInfoArr[0].current.split('//').join('/');
             var splitedDirStrArr = currentDirStr.split('/');
