aboutsummaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2016-08-19 10:46:42 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2016-08-19 10:46:42 +0200
commit77bce68b4553b55808bd5cc52593053c40560f38 (patch)
treef50ea225ab6e2167175fff2aea71fffd09276c1e /settings
parent3ccd69707e75c3d99156c41d8107621e07a01ded (diff)
downloadnextcloud-server-77bce68b4553b55808bd5cc52593053c40560f38.tar.gz
nextcloud-server-77bce68b4553b55808bd5cc52593053c40560f38.zip
Fix some jshint errors in settings/users
Diffstat (limited to 'settings')
-rw-r--r--settings/js/users/deleteHandler.js3
-rw-r--r--settings/js/users/groups.js4
-rw-r--r--settings/js/users/users.js10
3 files changed, 12 insertions, 5 deletions
diff --git a/settings/js/users/deleteHandler.js b/settings/js/users/deleteHandler.js
index a66e8b07a72..4f8d6eea9a7 100644
--- a/settings/js/users/deleteHandler.js
+++ b/settings/js/users/deleteHandler.js
@@ -17,6 +17,9 @@
* @param {removeCallback} removeCallback the function to be called after
* successful delete.
*/
+
+/* globals escapeHTML */
+
function DeleteHandler(endpoint, paramID, markCallback, removeCallback) {
this.oidToDelete = false;
this.canceled = false;
diff --git a/settings/js/users/groups.js b/settings/js/users/groups.js
index 36ebbd2fa6e..e83f00970c2 100644
--- a/settings/js/users/groups.js
+++ b/settings/js/users/groups.js
@@ -5,6 +5,8 @@
* See the COPYING-README file.
*/
+/* globals escapeHTML, UserList, DeleteHandler */
+
var $userGroupList,
$sortGroupBy;
@@ -269,7 +271,7 @@ GroupList = {
},
initDeleteHandling: function () {
//set up handler
- GroupDeleteHandler = new DeleteHandler('/settings/users/groups', 'groupname',
+ var GroupDeleteHandler = new DeleteHandler('/settings/users/groups', 'groupname',
GroupList.hide, GroupList.remove);
//configure undo
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 46c67fb8313..6be7b2d9526 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -6,6 +6,8 @@
* See the COPYING-README file.
*/
+/* globals escapeHTML, GroupList, DeleteHandler, UserManagementFilter */
+
var $userList;
var $userListBody;
@@ -457,7 +459,7 @@ var UserList = {
if (user === OC.currentUser && group === 'admin') {
return false;
}
- if (!oc_isadmin && checked.length === 1 && checked[0] === group) {
+ if (!OC.isUserAdmin() && checked.length === 1 && checked[0] === group) {
return false;
}
$.post(
@@ -500,7 +502,7 @@ var UserList = {
GroupList.addGroup(escapeHTML(group));
};
var label;
- if (oc_isadmin) {
+ if (OC.isUserAdmin()) {
label = t('settings', 'Add group');
}
else {
@@ -839,8 +841,8 @@ $(document).ready(function () {
if(UserList.availableGroups.indexOf(gid) === -1) {
UserList.availableGroups.push(gid);
}
- $li = GroupList.getGroupLI(gid);
- userCount = GroupList.getUserCount($li);
+ var $li = GroupList.getGroupLI(gid);
+ var userCount = GroupList.getUserCount($li);
GroupList.setUserCount($li, userCount + 1);
}
}