wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

port scroll improvements

Browse source
This commit is contained in:
Arthur Schiwon 2014-02-20 18:42:03 +01:00
parent f7903e92be
commit 1f4bc7cb10
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
settings/js/users/users.js
View file

@ -11,6 +11,7 @@ var UserList = {
//hardcoded in settings/users.php //hardcoded in settings/users.php
usersToLoad: 10, //So many users will be loaded when user scrolls down usersToLoad: 10, //So many users will be loaded when user scrolls down
currentGid: '',
/** /**
* @brief Initiate user deletion process in UI * @brief Initiate user deletion process in UI
@ -237,7 +238,10 @@ var UserList = {
if(gid === undefined) { if(gid === undefined) {
gid = ''; gid = '';
} }
UserList.currentGid = gid;
$.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset, limit: UserList.usersToLoad, gid: gid }), function (result) { $.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset, limit: UserList.usersToLoad, gid: gid }), function (result) {
var loadedUsers = 0;
var trs = [];
if (result.status === 'success') { if (result.status === 'success') {
//The offset does not mirror the amount of users available, //The offset does not mirror the amount of users available,
//because it is backend-dependent. For correct retrieval, //because it is backend-dependent. For correct retrieval,
@ -371,8 +375,8 @@ var UserList = {
if (!!UserList.noMoreEntries) { if (!!UserList.noMoreEntries) {
return; return;
} }
if ($(window).scrollTop() + $(window).height() > $(document).height() - 500) { if (UserList.scrollArea.scrollTop() + UserList.scrollArea.height() > UserList.scrollArea.get(0).scrollHeight - 500) {
UserList.update(true); UserList.update(UserList.currentGid, true);
} }
}, },
}; };
@ -394,6 +398,7 @@ $(document).ready(function () {
UserList.doSort(); UserList.doSort();
UserList.availableGroups = $('#content table').data('groups'); UserList.availableGroups = $('#content table').data('groups');
$(window).scroll(function(e) {UserList._onScroll(e);}); $(window).scroll(function(e) {UserList._onScroll(e);});
UserList.scrollArea.scroll(function(e) {UserList._onScroll(e);});
$('table').after($('<div class="loading" style="height: 200px; visibility: hidden;"></div>')); $('table').after($('<div class="loading" style="height: 200px; visibility: hidden;"></div>'));
$('select[multiple]').each(function (index, element) { $('select[multiple]').each(function (index, element) {