diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2014-04-01 15:59:53 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2014-06-02 12:53:55 +0200 |
| commit | 5f57d72b93afe221139f6d0a2be033aea926b313 (patch) | |
| tree | ba6768d8fb97bc9980f6b66a165de8b106b77025 /settings/js/users | |
| parent | fe4b1f8b101c0d582919f41efc7169c9d81aeca0 (diff) | |
| download | nextcloud-server-5f57d72b93afe221139f6d0a2be033aea926b313.tar.gz nextcloud-server-5f57d72b93afe221139f6d0a2be033aea926b313.zip | |
kick out deprecated and dislodged OC.Router
Diffstat (limited to 'settings/js/users')
| -rw-r--r-- | settings/js/users/users.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/settings/js/users/users.js b/settings/js/users/users.js index ce1ac36635c..63153f67f50 100644 --- a/settings/js/users/users.js +++ b/settings/js/users/users.js @@ -215,7 +215,8 @@ var UserList = { gid = ''; } UserList.currentGid = gid; - $.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset, limit: UserList.usersToLoad, gid: gid }), function (result) { + var query = $.param({ offset: UserList.offset, limit: UserList.usersToLoad, gid: gid }); + $.get(OC.generateUrl('/settings/ajax/userlist') + '?' + query, function (result) { var loadedUsers = 0; var trs = []; if (result.status === 'success') { @@ -375,8 +376,12 @@ $(document).ready(function () { UserList.doSort(); UserList.availableGroups = $('#content table').data('groups'); - $(window).scroll(function(e) {UserList._onScroll(e);}); - UserList.scrollArea.scroll(function(e) {UserList._onScroll(e);}); + + + UserList.scrollArea = $('#app-content'); + UserList.scrollArea.scroll(function(e) {UserList._onScroll(e);}); + + $('table').after($('<div class="loading" style="height: 200px; visibility: hidden;"></div>')); $('select[multiple]').each(function (index, element) { |