mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5420 from nextcloud/stable12-appmenu-fixes 

[stable12] App menu fixes
This commit is contained in:
Morris Jobke 2017-06-17 18:28:59 -05:00 committed by GitHub
parent 0e608188d2 02a63e9428
commit ab837da40b
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/js/js.js
View File

@ -1511,18 +1511,31 @@ function initCore() {
} }
var resizeMenu = function() { var resizeMenu = function() {
var maxApps = 8;
var appList = $('#appmenu li'); var appList = $('#appmenu li');
var availableWidth = $('#header-left').width() - $('#nextcloud').width() - 44; var headerWidth = $('#header-left').width() - $('#nextcloud').width()
var appCount = Math.floor((availableWidth)/44); var usePercentualAppMenuLimit = 0.33;
// show a maximum of 8 apps var minAppsDesktop = 8;
if(appCount >= maxApps) { var availableWidth = headerWidth - $(appList).width();
appCount = maxApps; var isMobile = $(window).width() < 768;
if (!isMobile) {
availableWidth = headerWidth * usePercentualAppMenuLimit;
} }
var appCount = Math.floor((availableWidth / $(appList).width()));
if (isMobile && appCount > minAppsDesktop) {
appCount = minAppsDesktop;
}
if (!isMobile && appCount < minAppsDesktop) {
appCount = minAppsDesktop;
}
// show at least 2 apps in the popover // show at least 2 apps in the popover
if(appList.length-1-appCount >= 1) { if(appList.length-1-appCount >= 1) {
appCount--; appCount--;
} }
// show at least one icon
if(appCount < 1) {
appCount = 1;
}
$('#more-apps a').removeClass('active'); $('#more-apps a').removeClass('active');
var lastShownApp; var lastShownApp;