kick out deprecated and dislodged OC.Router

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index ce1ac36635c4671b0c1c82d91170ebd2c5f04759..63153f67f50983e012df458c29d4f758d3f5ea7d 100644 (file)
--- 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) {