mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 06:08:21 +01:00
Code Issues Projects Releases Wiki Activity

Fix #4030: #search-menu-nav required in theme view layout main

Browse Source
This commit is contained in:
buddh4 2020-05-13 14:33:58 +02:00
parent e78d80ee40
commit feaa54e6fa
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
protected/humhub/docs/CHANGELOG.md
View File

@ -10,6 +10,7 @@ HumHub Change Log
- Fix #4036: Uploaded photos are not rotated correctly - Fix #4036: Uploaded photos are not rotated correctly
- Fix #4078: Richtext linkextension pattern fails on link extensions with containing `)` in link title - Fix #4078: Richtext linkextension pattern fails on link extensions with containing `)` in link title
- Fix #4080: Invalid absolute urls created in acceptance tests - Fix #4080: Invalid absolute urls created in acceptance tests
- Fix #4030: #search-menu-nav required in theme view layout main
1.5.1 (April 19, 2020) 1.5.1 (April 19, 2020)
---------------------- ----------------------

5
static/js/humhub/humhub.ui.topNavigation.js
View File

@ -48,11 +48,12 @@ humhub.module('ui.topNavigation', function (module, require, $) {
}; };
var isOverflow = function() { var isOverflow = function() {
return $topNav[0].offsetHeight > $topBarSecond[0].offsetHeight || $('.search-menu')[0].offsetTop; $searchMenu = $('.search-menu');
return $topNav[0].offsetHeight > $topBarSecond[0].offsetHeight || ($searchMenu.length && $searchMenu[0].offsetTop);
}; };
module.export({ module.export({
init: init, init: init,
sortOrder: 100, sortOrder: 100,
}) });
}); });