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 --- core/js/oc-dialogs.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'core/js/oc-dialogs.js') diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index f4bc174b5eb..04fc43af001 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -79,9 +79,9 @@ 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); @@ -106,7 +106,7 @@ var OCdialogs = { datapath.push(self.$filePicker.data('path') + '/' + $(element).text()); }); } else { - var datapath = self.$filePicker.data('path'); + datapath = self.$filePicker.data('path'); datapath += '/' + self.$filelist.find('.filepicker_element_selected .filename').text(); } callback(datapath); @@ -155,7 +155,7 @@ 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 +163,7 @@ 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 +171,7 @@ var OCdialogs = { { text: t('core', 'No'), click: function(){ - if (callback !== undefined) { callback(false) }; + if (callback !== undefined) { callback(false); } $(dialog_id).ocdialog('close'); } }]; @@ -179,7 +179,7 @@ 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'), @@ -187,7 +187,7 @@ var OCdialogs = { defaultButton: true }; break; - }; + } $(dialog_id).ocdialog({ closeOnEscape: true, @@ -269,7 +269,7 @@ var OCdialogs = { var sorted = dirs.concat(others); $.each(sorted, function(idx, entry) { - $li = self.$listTmpl.octemplate({ + var $li = self.$listTmpl.octemplate({ type: entry.type, dir: dir, filename: entry.name, @@ -287,13 +287,13 @@ var OCdialogs = { */ _fillSlug: function() { this.$dirTree.empty(); - var self = this + var self = this; var path = this.$filePicker.data('path'); var $template = $('{name}'); if(path) { var paths = path.split('/'); $.each(paths, function(index, dir) { - var dir = paths.pop(); + dir = paths.pop(); if(dir === '') { return false; } @@ -327,7 +327,7 @@ var OCdialogs = { $element.toggleClass('filepicker_element_selected'); return; } else if ( $element.data('type') === 'dir' ) { - this._fillFilePicker(this.$filePicker.data('path') + '/' + $element.data('entryname')) + this._fillFilePicker(this.$filePicker.data('path') + '/' + $element.data('entryname')); } } }; -- 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 'core/js/oc-dialogs.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 2ee8425295affcc5a5632d2f7ea17c66e539b3be Mon Sep 17 00:00:00 2001 From: kondou Date: Sat, 17 Aug 2013 12:07:58 +0200 Subject: Remove cancel button from filepicker Having the cancel button in the bottom right corner was a bit confusing. It's useless anyways, since there's a X in the top right. --- core/js/oc-dialogs.js | 4 ---- 1 file changed, 4 deletions(-) (limited to 'core/js/oc-dialogs.js') diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index f4bc174b5eb..5cbc8359d52 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -117,10 +117,6 @@ var OCdialogs = { text: t('core', 'Choose'), click: functionToCall, defaultButton: true - }, - { - text: t('core', 'Cancel'), - click: function(){self.$filePicker.ocdialog('close'); } }]; self.$filePicker.ocdialog({ -- cgit v1.2.3