From dd1bde98306dac8d7becd66f7de61b57c8a46eb9 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Fri, 30 Jun 2023 14:55:36 +0300 Subject: [PATCH] navbar fix --- client/src/views/site/navbar.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/client/src/views/site/navbar.js b/client/src/views/site/navbar.js index 75ac6146dd..1b455d6c09 100644 --- a/client/src/views/site/navbar.js +++ b/client/src/views/site/navbar.js @@ -963,17 +963,18 @@ class NavbarSiteView extends View { } function isDivider(item) { - return item === 'object' && item.type === 'divider'; + return typeof item === 'object' && item.type === 'divider'; } - //let moreIsMet = false; + let moreIsMet = false; this.tabList = this.tabList.filter((item, i) => { let nextItem = this.tabList[i + 1]; + let prevItem = this.tabList[i - 1]; - /*if (isMoreDelimiter(item)) { + if (isMoreDelimiter(item)) { moreIsMet = true; - }*/ + } if (!isDivider(item)) { return true; @@ -987,6 +988,10 @@ class NavbarSiteView extends View { return false; } + if (isDivider(prevItem) && isMoreDelimiter(nextItem) && moreIsMet) { + return false; + } + /*if (isMoreDelimiter(nextItem) && !moreIsMet) { return false; }*/