From 5f57d72b93afe221139f6d0a2be033aea926b313 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 1 Apr 2014 15:59:53 +0200
Subject: [PATCH] kick out deprecated and dislodged OC.Router

---
 settings/js/users/users.js | 11 ++++++++---
 1 file 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) {
-- 
2.39.5