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

Merge pull request #12820 from owncloud/user-management-on-large-screens 

fix initial loading limit of user management on large screens
This commit is contained in:
Robin McCorkell 2014-12-18 00:47:17 +00:00
parent 619dcae7af d3fe780805
commit a341f96f91
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
settings/js/users/users.js
View File

@ -353,10 +353,13 @@ var UserList = {
UserDeleteHandler.deleteEntry();
});
},
update: function (gid) {
update: function (gid, limit) {
if (UserList.updating) {
return;
}
if(!limit) {
limit = UserList.usersToLoad;
}
$userList.siblings('.loading').css('visibility', 'visible');
UserList.updating = true;
if(gid === undefined) {
@ -366,7 +369,7 @@ var UserList = {
var pattern = filter.getPattern();
$.get(
OC.generateUrl('/settings/users/users'),
{ offset: UserList.offset, limit: UserList.usersToLoad, gid: gid, pattern: pattern },
{ offset: UserList.offset, limit: limit, gid: gid, pattern: pattern },
function (result) {
var loadedUsers = 0;
var trs = [];
@ -385,6 +388,8 @@ var UserList = {
if (result.length > 0) {
UserList.doSort();
$userList.siblings('.loading').css('visibility', 'hidden');
// reset state on load
UserList.noMoreEntries = false;
}
else {
UserList.noMoreEntries = true;
@ -537,7 +542,7 @@ var UserList = {
return;
}
if (UserList.scrollArea.scrollTop() + UserList.scrollArea.height() > UserList.scrollArea.get(0).scrollHeight - 500) {
UserList.update(UserList.currentGid, true);
UserList.update(UserList.currentGid);
}
},
@ -770,7 +775,14 @@ $(document).ready(function () {
}
});
// calculate initial limit of users to load
var initialUserCountLimit = 20,
containerHeight = $('#app-content').height();
if(containerHeight > 40) {
initialUserCountLimit = Math.floor(containerHeight/40);
}
// trigger loading of users on startup
UserList.update(UserList.currentGid);
UserList.update(UserList.currentGid, initialUserCountLimit);
});