Fix FileNavigation

minjk-bl · minjk-bl · commit e950555119e1 · 2022-02-03T16:30:24.000+09:00
diff --git a/js/com/component/FileNavigation.js b/js/com/component/FileNavigation.js
@@ -313,9 +313,17 @@ define([
             // if it's outside of notebookPath, ignore notebookPath
             var prevLength = notebookPathStrLength;
             var useSidebar = false;
-            if (currentRelativePathStrArray.includes('..')) {
-                prevLength = 0;
-                useSidebar = true;
+            if (currentRelativePathStr.includes('..')) {
+                var upperList = currentRelativePathStr.match(/(\.\.\/)/g);
+                if (upperList && upperList.length > 0) {
+                    // in case, currentRelativePathStr = ../../somePathHere
+                    prevLength -= upperList.length * 3; // 3 = length of '../' upper path string
+                    useSidebar = true;
+                } else {
+                    // in case, currentRelativePathStr = .. 
+                    prevLength = 0;
+                    useSidebar = true;
+                }
             }
             let slashStr = '/';
             currentRelativePathStrArray.forEach((pathToken,index) => {
@@ -447,54 +455,7 @@ define([
             var fileNavigationState = this.pathState;
 
             var baseFolder = fileNavigationState.baseFolder;
-            var baseDirStr = fileNavigationState.baseDir;
-            var noteBookPathStr = fileNavigationState.notebookPath;
             var currentDirStr = fileNavigationState.currentPath;
-            var noteBookPathStrLength = noteBookPathStr.length;
-        
-            var baseDirStrLength = baseDirStr.length;
-
-            /** upDirectoryCount: 
-             *  count how many times went up to the parent path, since file navigation opened
-             */
-            var upDirectoryCount = 0;
-            var _upDirectoryCount = 0;
-
-            var splitedNoteBookPathStrArray = noteBookPathStr.split('/');
-            var splitedBaseDirArray = baseDirStr.split('/');
-            var splitedCurrentDirArray  = currentDirStr.split('/');
-
-            var relativeBaseDirArray = splitedBaseDirArray.slice(splitedNoteBookPathStrArray.length, splitedBaseDirArray.length);
-            var relativeCurrentDirArray = splitedCurrentDirArray.slice(splitedNoteBookPathStrArray.length, splitedCurrentDirArray.length);
-
-            /** 
-             * compare base path and notebook path, increase upDirectoryCount
-             */
-            var _baseDirStrLength = baseDirStrLength;
-            while ( noteBookPathStrLength < _baseDirStrLength ) {
-                _baseDirStrLength--;
-                if ( baseDirStr[_baseDirStrLength] === '/') {
-                    upDirectoryCount += 1;
-                }
-            }
-
-            /**
-             * Compare notebook path and current relative path, decrease upDirectoryCount
-             */
-            relativeCurrentDirArray.forEach((forderName,index) => {
-                if ( forderName === relativeBaseDirArray[index] ) {
-                    upDirectoryCount -= 1;
-                }
-            });
-        
-            /**
-             * Add ../ based on upDirectoryCount
-             */
-            _upDirectoryCount = upDirectoryCount;
-            var prefixUpDirectory = ``;
-            while (_upDirectoryCount-- > 0) {
-                prefixUpDirectory += `../`;
-            }
 
             var slashstr = `/`;
             if (relativeDirPath === '') {
@@ -504,10 +465,9 @@ define([
             var pathInput = '';
             var fileInput = `${filePathStr}`;
             // if baseFolder doesn't exist in current path
-            if (upDirectoryCount > 0 
-                && currentDirStr.indexOf(baseFolder) === -1) {
+            if (currentDirStr.indexOf(baseFolder) === -1) {
                 
-                pathInput = `${prefixUpDirectory}${relativeDirPath}${slashstr}${filePathStr}`;
+                pathInput = `${relativeDirPath}${slashstr}${filePathStr}`;
             } else {
                 // if baseFolder exists in current path
                 pathInput = `./${relativeDirPath}${slashstr}${filePathStr}`;
