summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorChristopher <kondou@ts.unde.re>2013-08-20 12:45:10 -0700
committerChristopher <kondou@ts.unde.re>2013-08-20 12:45:10 -0700
commit90da518e3e24e088db9e2c7b356fda74266d004d (patch)
tree90a70e40faac859f7a926ece109a40c9a915e10a /settings
parentde949b1caa4491a8016ed5e609fc781526fea54d (diff)
parentedd92e4c09151238a89816186914f9382293ab9b (diff)
downloadnextcloud-server-90da518e3e24e088db9e2c7b356fda74266d004d.tar.gz
nextcloud-server-90da518e3e24e088db9e2c7b356fda74266d004d.zip
Merge pull request #4262 from owncloud/fix_jslint_kondou
Fix some JSLint warnings
Diffstat (limited to 'settings')
-rw-r--r--settings/js/apps.js2
-rw-r--r--settings/js/log.js3
-rw-r--r--settings/js/personal.js2
-rw-r--r--settings/js/users.js10
4 files changed, 10 insertions, 7 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 2ff3f0536d4..cf8cd91bd40 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -54,7 +54,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
enableApp:function(appid, active, element) {
console.log('enableApp:', appid, active, element);
var appitem=$('#leftcontent li[data-id="'+appid+'"]');
- appData = appitem.data('app');
+ var appData = appitem.data('app');
appData.active = !active;
appitem.data('app', appData);
element.val(t('settings','Please wait....'));
diff --git a/settings/js/log.js b/settings/js/log.js
index 1ef9b419cdb..5832c698ad5 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -35,8 +35,9 @@ OC.Log={
$('#moreLog').show();
// remove all non-remaining items
$('#log tr').slice(OC.Log.loaded).remove();
- if(OC.Log.loaded <= 3)
+ if(OC.Log.loaded <= 3) {
$('#lessLog').hide();
+ }
},
addEntries:function(entries){
for(var i=0;i<entries.length;i++){
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 94ef959488f..8ad26c086b5 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -8,7 +8,7 @@
* Post the email address change to the server.
*/
function changeEmailAddress(){
- emailInfo = $('#email');
+ var emailInfo = $('#email');
if (emailInfo.val() === emailInfo.defaultValue){
return;
}
diff --git a/settings/js/users.js b/settings/js/users.js
index 038ea369801..ab08d7099c6 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -171,7 +171,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;
@@ -268,7 +270,7 @@ var UserList = {
if ($(element).find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $(element).data('msid')) {
$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
}
- })
+ });
};
var label;
if (isadmin) {
@@ -310,7 +312,7 @@ var UserList = {
if ($(element).find('option[value="' + group + '"]').length === 0) {
$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
}
- })
+ });
};
element.multiSelect({
createCallback: addSubAdmin,
@@ -475,7 +477,7 @@ $(document).ready(function () {
}
OC.Notification.hide();
});
- UserList.useUndo = ('onbeforeunload' in window)
+ UserList.useUndo = ('onbeforeunload' in window);
$(window).bind('beforeunload', function () {
UserList.finishDelete(null);
});