From aaf0fec9f54bc6f9eef5df00441d593e053ee74b Mon Sep 17 00:00:00 2001 From: kondou Date: Wed, 31 Jul 2013 21:21:02 +0200 Subject: Fix some JSLint warnings --- settings/js/users.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'settings/js/users.js') diff --git a/settings/js/users.js b/settings/js/users.js index 6a8afc4ca36..798acce8471 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -166,7 +166,7 @@ var UserList = { var c = Number(aa[x]), d = Number(bb[x]); if (c === aa[x] && d === bb[x]) { return c - d; - } else return (aa[x] > bb[x]) ? 1 : -1; + } else { return (aa[x] > bb[x]) ? 1 : -1; } } } return aa.length - bb.length; @@ -262,7 +262,7 @@ var UserList = { if ($(element).find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $(element).data('msid')) { $(element).append(''); } - }) + }); }; var label; if (isadmin) { @@ -304,7 +304,7 @@ var UserList = { if ($(element).find('option[value="' + group + '"]').length === 0) { $(element).append(''); } - }) + }); }; element.multiSelect({ createCallback: addSubAdmin, @@ -469,7 +469,7 @@ $(document).ready(function () { } OC.Notification.hide(); }); - UserList.useUndo = ('onbeforeunload' in window) + UserList.useUndo = ('onbeforeunload' in window); $(window).bind('beforeunload', function () { UserList.finishDelete(null); }); -- cgit v1.2.3 From 1348330c7d75d2b60d845a43be57dedc6199ea1a Mon Sep 17 00:00:00 2001 From: kondou Date: Thu, 1 Aug 2013 18:44:01 +0200 Subject: Fix a syntax error & have if-conds in an own line --- apps/files/js/file-upload.js | 4 +++- apps/files/js/keyboardshortcuts.js | 4 +++- apps/files_sharing/js/public.js | 2 +- core/js/oc-dialogs.js | 28 +++++++++++++++++++++------- settings/js/users.js | 4 +++- 5 files changed, 31 insertions(+), 11 deletions(-) (limited to 'settings/js/users.js') diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 08047c25fdb..87d8b353b68 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -156,7 +156,9 @@ $(document).ready(function() { // http://stackoverflow.com/a/6700/11236 var size = 0, key; for (key in obj) { - if (obj.hasOwnProperty(key)) { size++; } + if (obj.hasOwnProperty(key)) { + size++; + } } return size; }; diff --git a/apps/files/js/keyboardshortcuts.js b/apps/files/js/keyboardshortcuts.js index 1d3bae925bc..9d6c3ae8c33 100644 --- a/apps/files/js/keyboardshortcuts.js +++ b/apps/files/js/keyboardshortcuts.js @@ -131,7 +131,9 @@ var Files = Files || {}; return; } var preventDefault = false; - if ($.inArray(event.keyCode, keys) === -1) { keys.push(event.keyCode); } + if ($.inArray(event.keyCode, keys) === -1) { + keys.push(event.keyCode); + } if ( $.inArray(keyCodes.n, keys) !== -1 && ($.inArray(keyCodes.cmdFirefox, keys) !== -1 || $.inArray(keyCodes.cmdOpera, keys) !== -1 || $.inArray(keyCodes.leftCmdWebKit, keys) !== -1 || $.inArray(keyCodes.rightCmdWebKit, keys) !== -1 || $.inArray(keyCodes.ctrl, keys) !== -1 || event.ctrlKey)) { preventDefault = true; //new file/folder prevent browser from responding diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 6182e1dde0e..7ffd5e06873 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -51,7 +51,7 @@ $(document).ready(function() { } // Add some form data to the upload handler - var file_upload_param.formData = { + file_upload_param.formData = { MAX_FILE_SIZE: $('#uploadMaxFilesize').val(), requesttoken: $('#publicUploadRequestToken').val(), dirToken: $('#dirToken').val(), diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 04fc43af001..b3b1958659f 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -79,9 +79,15 @@ var OCdialogs = { title: title }).data('path', ''); - if (modal === undefined) { modal = false; } - if (multiselect === undefined) { multiselect = false; } - if (mimetype_filter === undefined) { mimetype_filter = ''; } + if (modal === undefined) { + modal = false; + } + if (multiselect === undefined) { + multiselect = false; + } + if (mimetype_filter === undefined) { + mimetype_filter = ''; + } $('body').append(self.$filePicker); @@ -155,7 +161,9 @@ var OCdialogs = { message: content, type: dialog_type }); - if (modal === undefined) { modal = false; } + if (modal === undefined) { + modal = false; + } $('body').append($dlg); var buttonlist = []; switch (buttons) { @@ -163,7 +171,9 @@ var OCdialogs = { buttonlist = [{ text: t('core', 'Yes'), click: function(){ - if (callback !== undefined) { callback(true); } + if (callback !== undefined) { + callback(true); + } $(dialog_id).ocdialog('close'); }, defaultButton: true @@ -171,7 +181,9 @@ var OCdialogs = { { text: t('core', 'No'), click: function(){ - if (callback !== undefined) { callback(false); } + if (callback !== undefined) { + callback(false); + } $(dialog_id).ocdialog('close'); } }]; @@ -179,7 +191,9 @@ var OCdialogs = { case OCdialogs.OK_BUTTON: var functionToCall = function() { $(dialog_id).ocdialog('close'); - if(callback !== undefined) { callback(); } + if(callback !== undefined) { + callback(); + } }; buttonlist[0] = { text: t('core', 'Ok'), diff --git a/settings/js/users.js b/settings/js/users.js index 798acce8471..ac0d7638f72 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -166,7 +166,9 @@ var UserList = { var c = Number(aa[x]), d = Number(bb[x]); if (c === aa[x] && d === bb[x]) { return c - d; - } else { return (aa[x] > bb[x]) ? 1 : -1; } + } else { + return (aa[x] > bb[x]) ? 1 : -1; + } } } return aa.length - bb.length; -- cgit v1.2.3 From cd7e57e8ec64ffef8faec750ebffbdc6138ec9a0 Mon Sep 17 00:00:00 2001 From: Owen Winkler Date: Thu, 15 Aug 2013 06:19:40 -0400 Subject: Use JSON to send/receive group data. Squashed commits from PR #4364 for master. --- settings/ajax/createuser.php | 2 +- settings/js/users.js | 21 ++++++++++----------- settings/templates/users.php | 6 +++--- settings/users.php | 15 ++++++++------- 4 files changed, 22 insertions(+), 22 deletions(-) (limited to 'settings/js/users.js') diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php index 205958f88d3..ccc2a5d402e 100644 --- a/settings/ajax/createuser.php +++ b/settings/ajax/createuser.php @@ -41,7 +41,7 @@ try { OC_JSON::success(array("data" => array( "username" => $username, - "groups" => implode( ", ", OC_Group::getUserGroups( $username ))))); + "groups" => OC_Group::getUserGroups( $username )))); } catch (Exception $exception) { OC_JSON::error(array("data" => array( "message" => $exception->getMessage()))); } diff --git a/settings/js/users.js b/settings/js/users.js index 6a8afc4ca36..948849fe539 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -89,10 +89,10 @@ var UserList = { tr.attr('data-displayName', displayname); tr.find('td.name').text(username); tr.find('td.displayName > span').text(displayname); - var groupsSelect = $('').attr('data-username', username).attr('data-user-groups', groups); + var groupsSelect = $('').attr('data-username', username).attr('data-user-groups', [groups]); tr.find('td.groups').empty(); if (tr.find('td.subadmins').length > 0) { - var subadminSelect = $('').attr('data-username', username).attr('data-user-groups', [groups]).attr('data-subadmin', [subadmin]); tr.find('td.subadmins').empty(); } $.each(this.availableGroups, function (i, group) { @@ -227,7 +227,7 @@ var UserList = { var user = element.attr('data-username'); if ($(element).attr('class') === 'groupsselect') { if (element.data('userGroups')) { - checked = String(element.data('userGroups')).split(', '); + checked = element.data('userGroups'); } if (user) { var checkHandeler = function (group) { @@ -244,11 +244,10 @@ var UserList = { group: group }, function (response) { - if(response.status === 'success') { - if(UserList.availableGroups.indexOf(response.data.groupname) === -1 && response.data.action === 'add') { - UserList.availableGroups.push(response.data.groupname); - } - } else { + if(response.status === 'success' && UserList.availableGroups.indexOf(response.data.groupname) === -1 && response.data.action === 'add') { + UserList.availableGroups.push(response.data.groupname); + } + if(response.data.message) { OC.Notification.show(response.data.message); } } @@ -282,7 +281,7 @@ var UserList = { } if ($(element).attr('class') === 'subadminsselect') { if (element.data('subadmin')) { - checked = String(element.data('subadmin')).split(', '); + checked = element.data('subadmin'); } var checkHandeler = function (group) { if (group === 'admin') { @@ -321,7 +320,7 @@ var UserList = { $(document).ready(function () { UserList.doSort(); - UserList.availableGroups = $('#content table').attr('data-groups').split(', '); + UserList.availableGroups = $('#content table').data('groups'); $('tbody tr:last').bind('inview', function (event, isInView, visiblePartX, visiblePartY) { OC.Router.registerLoadedCallback(function () { UserList.update(); @@ -450,7 +449,7 @@ $(document).ready(function () { t('settings', 'Error creating user')); } else { if (result.data.groups) { - var addedGroups = result.data.groups.split(', '); + var addedGroups = result.data.groups; UserList.availableGroups = $.unique($.merge(UserList.availableGroups, addedGroups)); } if($('tr[data-uid="' + username + '"]').length === 0) { diff --git a/settings/templates/users.php b/settings/templates/users.php index 4ddef3ff1b5..22450fdf25f 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -78,7 +78,7 @@ $_['subadmingroups'] = array_flip($items); - +
@@ -108,7 +108,7 @@ $_['subadmingroups'] = array_flip($items);
t('Username'))?>').attr('data-username', username).attr('data-user-groups', [groups]); + var groupsSelect = $('') + .attr('data-username', username) + .attr('data-user-groups', [groups]); tr.find('td.groups').empty(); if (tr.find('td.subadmins').length > 0) { - var subadminSelect = $('') + .attr('data-username', username) + .attr('data-user-groups', [groups]) + .attr('data-subadmin', [subadmin]); tr.find('td.subadmins').empty(); } $.each(this.availableGroups, function (i, group) { @@ -244,7 +249,9 @@ var UserList = { group: group }, function (response) { - if(response.status === 'success' && UserList.availableGroups.indexOf(response.data.groupname) === -1 && response.data.action === 'add') { + if(response.status === 'success' + && UserList.availableGroups.indexOf(response.data.groupname) === -1 + && response.data.action === 'add') { UserList.availableGroups.push(response.data.groupname); } if(response.data.message) { -- cgit v1.2.3