diff options
| -rw-r--r-- | apps/files/js/file-upload.js | 4 | ||||
| -rw-r--r-- | apps/files/js/keyboardshortcuts.js | 4 | ||||
| -rw-r--r-- | apps/files_sharing/js/public.js | 2 | ||||
| -rw-r--r-- | core/js/oc-dialogs.js | 28 | ||||
| -rw-r--r-- | settings/js/users.js | 4 |
5 files changed, 31 insertions, 11 deletions
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; |