Skip to content

Commit 5d4c032

Browse files
committed
fix: Improve navbar and state loading robustness
1 parent 2ff6e4c commit 5d4c032

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

src/pages/fileBrowser/fileBrowser.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,14 +1333,16 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) {
13331333
* @param {String} url
13341334
*/
13351335
function pushToNavbar(name, url, action) {
1336+
if (!url) return;
1337+
const displayName = name || Url.basename(url) || url;
13361338
$navigation.append(
13371339
<span
13381340
id={getNavId(url)}
13391341
className="nav"
13401342
data-url={url}
1341-
data-name={name}
1343+
data-name={displayName}
13421344
attr-action="navigation"
1343-
attr-text={name}
1345+
attr-text={displayName}
13441346
tabIndex={-1}
13451347
></span>,
13461348
);
@@ -1359,14 +1361,20 @@ function FileBrowserInclude(mode, info, doesOpenLast = true) {
13591361
* @param {Array<Location>} states
13601362
*/
13611363
function loadStates(states) {
1362-
if (!Array.isArray(states)) return;
1364+
if (!Array.isArray(states) || !states.length) return;
13631365

13641366
const backNavigation = [];
1365-
const { url, name } = states.pop();
1367+
const lastState = states.pop();
1368+
if (!lastState || !lastState.url) return;
1369+
const { url } = lastState;
1370+
const name = lastState.name || Url.basename(url) || url;
13661371
let { url: lastUrl, name: lastName } = currentDir;
13671372

13681373
while (states.length) {
13691374
const location = states.splice(0, 1)[0];
1375+
if (!location || !location.url) {
1376+
continue;
1377+
}
13701378
const { url, name } = location;
13711379
let action;
13721380

0 commit comments

Comments
 (0)