renamane

client/src/views/site/navbar.js

@@ -471,7 +471,7 @@ define('views/site/navbar', ['view'], function (Dep) {
             }
         },
 
-        adjustHorizontal: function () {
+        adjustTop: function () {
             var smallScreenWidth = this.getThemeManager().getParam('screenWidthXs');
             var navbarHeight = this.getNavbarHeight();
 
@@ -555,7 +555,7 @@ define('views/site/navbar', ['view'], function (Dep) {
 
             var navbarNeededHeight = navbarHeight + 1;
 
-            this.adjustBodyMinHeightMethodName = 'adjustBodyMinHeightHorizontal';
+            this.adjustBodyMinHeightMethodName = 'adjustBodyMinHeightTop';
 
             let $moreDd = $('#nav-more-tabs-dropdown');
             let $moreLi = $moreDd.closest('li');
@@ -627,16 +627,15 @@ define('views/site/navbar', ['view'], function (Dep) {
             processUpdateWidth();
         },
 
-        adjustVertical: function () {
-            var smallScreenWidth = this.getThemeManager().getParam('screenWidthXs');
-            var navbarStaticItemsHeight = this.getStaticItemsHeight();
+        adjustSide: function () {
+            let smallScreenWidth = this.getThemeManager().getParam('screenWidthXs');
+            let navbarStaticItemsHeight = this.getStaticItemsHeight();
 
-            var $window = $(window);
+            let $window = $(window);
+            let $tabs = this.$tabs;
+            let $more = this.$more;
 
-            var $tabs = this.$tabs;
-            var $more = this.$more;
-
-            this.adjustBodyMinHeightMethodName = 'adjustBodyMinHeightVertical';
+            this.adjustBodyMinHeightMethodName = 'adjustBodyMinHeightSide';
 
             if ($more.children().length === 0) {
                 $more.parent().addClass('hidden');
@@ -660,7 +659,7 @@ define('views/site/navbar', ['view'], function (Dep) {
                 $more.scrollTop($window.scrollTop());
             });
 
-            var updateSizeForVertical = () => {
+            let updateSizeForSide = () => {
                 var windowHeight = window.innerHeight;
                 var windowWidth = window.innerWidth;
 
@@ -678,10 +677,10 @@ define('views/site/navbar', ['view'], function (Dep) {
             };
 
             $(window).on('resize.navbar', () => {
-                updateSizeForVertical();
+                updateSizeForSide();
             });
 
-            updateSizeForVertical();
+            updateSizeForSide();
 
             this.adjustBodyMinHeight();
         },
@@ -706,7 +705,7 @@ define('views/site/navbar', ['view'], function (Dep) {
             this[this.adjustBodyMinHeightMethodName]();
         },
 
-        adjustBodyMinHeightVertical: function () {
+        adjustBodyMinHeightSide: function () {
             var minHeight = this.$tabs.get(0).scrollHeight + this.getStaticItemsHeight();
 
             var moreHeight = 0;
@@ -744,7 +743,7 @@ define('views/site/navbar', ['view'], function (Dep) {
             this.$body.css('minHeight', minHeight + 'px');
         },
 
-        adjustBodyMinHeightHorizontal: function () {
+        adjustBodyMinHeightTop: function () {
             var minHeight = this.getNavbarHeight();
 
             this.$more.find('> li').each((i, el) => {
@@ -862,12 +861,12 @@ define('views/site/navbar', ['view'], function (Dep) {
                     }
 
                     if (this.getThemeManager().isUserTheme()) {
-                        setTimeout(() => this.adjustVertical(), 10);
+                        setTimeout(() => this.adjustSide(), 10);
 
                         return;
                     }
 
-                    this.adjustVertical();
+                    this.adjustSide();
                 };
 
                 process();
@@ -883,12 +882,12 @@ define('views/site/navbar', ['view'], function (Dep) {
                 }
 
                 if (this.getThemeManager().isUserTheme()) {
-                    setTimeout(() => this.adjustHorizontal(), 10);
+                    setTimeout(() => this.adjustTop(), 10);
 
                     return;
                 }
 
-                this.adjustHorizontal();
+                this.adjustTop();
             };
 
             process();
@@ -981,18 +980,14 @@ define('views/site/navbar', ['view'], function (Dep) {
         },
 
         prepareTabItemDefs: function (params, tab, i, vars) {
-            var label;
-            var link;
+            let label;
+            let link;
 
-            var iconClass = null;
-
-            var color = null;
-
-            var isGroup = false;
-
-            var name = tab;
-
-            var aClassName = 'nav-link';
+            let iconClass = null;
+            let color = null;
+            let isGroup = false;
+            let name = tab;
+            let aClassName = 'nav-link';
 
             if (tab === 'Home') {
                 label = this.getLanguage().translate(tab);
@@ -1022,7 +1017,7 @@ define('views/site/navbar', ['view'], function (Dep) {
 
             label = label || '';
 
-            var shortLabel = label.substring(0, 2);
+            let shortLabel = label.substring(0, 2);
 
             if (!params.colorsDisabled && !isGroup) {
                 color = this.getMetadata().get(['clientDefs', tab, 'color']);
@@ -1032,7 +1027,7 @@ define('views/site/navbar', ['view'], function (Dep) {
                 iconClass = this.getMetadata().get(['clientDefs', tab, 'iconClass'])
             }
 
-            var o = {
+            let o = {
                 link: link,
                 label: label,
                 shortLabel: shortLabel,