diff options
author | kondou <kondou@ts.unde.re> | 2014-03-01 02:46:27 +0100 |
---|---|---|
committer | kondou <kondou@ts.unde.re> | 2014-06-02 21:09:41 +0200 |
commit | 9bc3f3cf304c300c758743f2e460beb1fee3ecac (patch) | |
tree | ea564110fcd3a28caee27af3bf36486d1783cc3e /core | |
parent | c88c0b9a13231478c626296d78aac7c1f66d87d9 (diff) | |
download | nextcloud-server-9bc3f3cf304c300c758743f2e460beb1fee3ecac.tar.gz nextcloud-server-9bc3f3cf304c300c758743f2e460beb1fee3ecac.zip |
Scrutinizer cleanup
Diffstat (limited to 'core')
-rw-r--r-- | core/js/avatar.js | 4 | ||||
-rw-r--r-- | core/js/compatibility.js | 3 | ||||
-rw-r--r-- | core/js/eventsource.js | 12 | ||||
-rw-r--r-- | core/js/jquery.ocdialog.js | 16 | ||||
-rw-r--r-- | core/js/js.js | 14 | ||||
-rw-r--r-- | core/js/listview.js | 8 | ||||
-rw-r--r-- | core/js/multiselect.js | 46 | ||||
-rw-r--r-- | core/js/oc-dialogs.js | 18 | ||||
-rw-r--r-- | core/js/octemplate.js | 11 | ||||
-rw-r--r-- | core/js/setup.js | 5 | ||||
-rw-r--r-- | core/js/share.js | 50 | ||||
-rw-r--r-- | core/js/singleselect.js | 4 | ||||
-rw-r--r-- | core/js/tags.js | 34 | ||||
-rw-r--r-- | core/js/tests/specHelper.js | 3 | ||||
-rw-r--r-- | core/js/tests/specs/coreSpec.js | 14 | ||||
-rw-r--r-- | core/js/visitortimezone.js | 3 |
16 files changed, 166 insertions, 79 deletions
diff --git a/core/js/avatar.js b/core/js/avatar.js index 67d6b9b7b95..6835f6ef0ac 100644 --- a/core/js/avatar.js +++ b/core/js/avatar.js @@ -7,7 +7,9 @@ $(document).ready(function(){ } }; - $('#header .avatardiv').avatar(OC.currentUser, 32, undefined, true, callback); + $('#header .avatardiv').avatar( + OC.currentUser, 32, undefined, true, callback + ); // Personal settings $('#avatar .avatardiv').avatar(OC.currentUser, 128); } diff --git a/core/js/compatibility.js b/core/js/compatibility.js index c07288857f2..ac942d202e8 100644 --- a/core/js/compatibility.js +++ b/core/js/compatibility.js @@ -42,8 +42,9 @@ if (!Array.prototype.filter) { for (var i = 0; i < len; i++) { if (i in this) { var val = this[i]; // in case fun mutates this - if (fun.call(thisp, val, i, this)) + if (fun.call(thisp, val, i, this)) { res.push(val); + } } } return res; diff --git a/core/js/eventsource.js b/core/js/eventsource.js index 70f4a2a9aa8..4834653dda6 100644 --- a/core/js/eventsource.js +++ b/core/js/eventsource.js @@ -20,10 +20,12 @@ */ /** - * Wrapper for server side events (http://en.wikipedia.org/wiki/Server-sent_events) + * Wrapper for server side events + * (http://en.wikipedia.org/wiki/Server-sent_events) * includes a fallback for older browsers and IE * - * Use server side events with caution, too many open requests can hang the server + * use server side events with caution, to many open requests can hang the + * server */ /** @@ -43,7 +45,7 @@ OC.EventSource=function(src,data){ dataStr+='requesttoken='+oc_requesttoken; if(!this.useFallBack && typeof EventSource !='undefined'){ var joinChar = '&'; - if(src.indexOf('?') == -1) { + if(src.indexOf('?') === -1) { joinChar = '?'; } this.source=new EventSource(src+joinChar+dataStr); @@ -60,13 +62,13 @@ OC.EventSource=function(src,data){ this.iframe.hide(); var joinChar = '&'; - if(src.indexOf('?') == -1) { + if(src.indexOf('?') === -1) { joinChar = '?'; } this.iframe.attr('src',src+joinChar+'fallback=true&fallback_id='+OC.EventSource.iframeCount+'&'+dataStr); $('body').append(this.iframe); this.useFallBack=true; - OC.EventSource.iframeCount++ + OC.EventSource.iframeCount++; } //add close listener this.listen('__internal__',function(data){ diff --git a/core/js/jquery.ocdialog.js b/core/js/jquery.ocdialog.js index e2433f5f980..af32591ce52 100644 --- a/core/js/jquery.ocdialog.js +++ b/core/js/jquery.ocdialog.js @@ -35,11 +35,18 @@ }); $(document).on('keydown keyup', function(event) { - if(event.target !== self.$dialog.get(0) && self.$dialog.find($(event.target)).length === 0) { + if ( + event.target !== self.$dialog.get(0) && + self.$dialog.find($(event.target)).length === 0 + ) { return; } // Escape - if(event.keyCode === 27 && event.type === 'keydown' && self.options.closeOnEscape) { + if ( + event.keyCode === 27 && + event.type === 'keydown' && + self.options.closeOnEscape + ) { event.stopImmediatePropagation(); self.close(); return false; @@ -52,7 +59,10 @@ return false; } // If no button is selected we trigger the primary - if(self.$buttonrow && self.$buttonrow.find($(event.target)).length === 0) { + if ( + self.$buttonrow && + self.$buttonrow.find($(event.target)).length === 0 + ) { var $button = self.$buttonrow.find('button.primary'); if($button) { $button.trigger('click'); diff --git a/core/js/js.js b/core/js/js.js index a859034ed01..51878cb9133 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1,7 +1,7 @@ /** * Disable console output unless DEBUG mode is enabled. * Add - * define('DEBUG', true); + * define('DEBUG', true); * To the end of config/config.php to enable debug mode. * The undefined checks fix the broken ie8 console */ @@ -23,7 +23,10 @@ if (typeof oc_webroot === "undefined") { oc_webroot = oc_webroot.substr(0, oc_webroot.lastIndexOf('/')); } } -if (oc_debug !== true || typeof console === "undefined" || typeof console.log === "undefined") { +if ( + oc_debug !== true || typeof console === "undefined" || + typeof console.log === "undefined" +) { if (!window.console) { window.console = {}; } @@ -37,7 +40,8 @@ if (oc_debug !== true || typeof console === "undefined" || typeof console.log == function initL10N(app) { if (!( t.cache[app] )) { $.ajax(OC.filePath('core', 'ajax', 'translations.php'), { - async: false,//todo a proper solution for this without sync ajax calls + // TODO a proper solution for this without sync ajax calls + async: false, data: {'app': app}, type: 'POST', success: function (jsondata) { @@ -75,8 +79,8 @@ function initL10N(app) { /* We used to use eval, but it seems IE has issues with it. * We now use "new Function", though it carries a slightly * bigger performance hit. - var code = 'function (n) { var plural; var nplurals; '+pf+' return { "nplural" : nplurals, "plural" : (plural === true ? 1 : plural ? plural : 0) }; };'; - Gettext._locale_data[domain].head.plural_func = eval("("+code+")"); + var code = 'function (n) { var plural; var nplurals; '+pf+' return { "nplural" : nplurals, "plural" : (plural === true ? 1 : plural ? plural : 0) }; };'; + Gettext._locale_data[domain].head.plural_func = eval("("+code+")"); */ var code = 'var plural; var nplurals; '+pf+' return { "nplural" : nplurals, "plural" : (plural === true ? 1 : plural ? plural : 0) };'; t.plural_function[app] = new Function("n", code); diff --git a/core/js/listview.js b/core/js/listview.js index 18d0bdeaf7c..239792d6346 100644 --- a/core/js/listview.js +++ b/core/js/listview.js @@ -46,7 +46,7 @@ ListView.prototype={ $.each(this.hoverElement,function(index,collumn){ $.each(collumn,function(index,element){ var html='<a href="#" title="'+element.title+'" class="hoverElement"/>'; - var element=$(html); + element=$(html); element.append($('<img src="'+element.icon+'"/>')); element.click(element.callback); tr.children('td.'+collumn).append(element); @@ -59,9 +59,9 @@ ListView.prototype={ hoverHandelerOut:function(tr){ tr.find('*.hoverElement').remove(); }, - addHoverElement:function(collumn,icon,title,callback){ - if(!this.hoverElements[collumn]){ - this.hoverElements[collumn]=[]; + addHoverElement:function(column,icon,title,callback){ + if(!this.hoverElements[column]){ + this.hoverElements[column]=[]; } this.hoverElements[row].push({icon:icon,callback:callback,title:title}); }, diff --git a/core/js/multiselect.js b/core/js/multiselect.js index 02699636a20..03408033db5 100644 --- a/core/js/multiselect.js +++ b/core/js/multiselect.js @@ -1,14 +1,19 @@ /** - * @param 'createCallback' A function to be called when a new entry is created. Two arguments are supplied to this function: - * The select element used and the value of the option. If the function returns false addition will be cancelled. If it returns - * anything else it will be used as the value of the newly added option. + * @param 'createCallback' A function to be called when a new entry is created. + * Two arguments are supplied to this function: + * The select element used and the value of the option. If the function + * returns false addition will be cancelled. If it returns + * anything else it will be used as the value of the newly added option. * @param 'createText' The placeholder text for the create action. * @param 'title' The title to show if no options are selected. - * @param 'checked' An array containing values for options that should be checked. Any options which are already selected will be added to this array. + * @param 'checked' An array containing values for options that should be + * checked. Any options which are already selected will be added to this array. * @param 'labels' The corresponding labels to show for the checked items. - * @param 'oncheck' Callback function which will be called when a checkbox/radiobutton is selected. If the function returns false the input will be unchecked. + * @param 'oncheck' Callback function which will be called when a + * checkbox/radiobutton is selected. If the function returns false the input will be unchecked. * @param 'onuncheck' @see 'oncheck'. - * @param 'singleSelect' If true radiobuttons will be used instead of checkboxes. + * @param 'singleSelect' If true radiobuttons will be used instead of + * checkboxes. */ (function( $ ){ var multiSelectId=-1; @@ -32,12 +37,18 @@ $.extend(settings,options); $.each(this.children(),function(i,option) { // If the option is selected, but not in the checked array, add it. - if($(option).attr('selected') && settings.checked.indexOf($(option).val()) === -1) { + if ( + $(option).attr('selected') && + settings.checked.indexOf($(option).val()) === -1 + ) { settings.checked.push($(option).val()); settings.labels.push($(option).text().trim()); } // If the option is in the checked array but not selected, select it. - else if(settings.checked.indexOf($(option).val()) !== -1 && !$(option).attr('selected')) { + else if ( + settings.checked.indexOf($(option).val()) !== -1 && + !$(option).attr('selected') + ) { $(option).attr('selected', 'selected'); settings.labels.push($(option).text().trim()); } @@ -104,7 +115,7 @@ var label=$('<label/>'); label.attr('for',id); label.text(element.text() || item); - if(settings.checked.indexOf(item)!=-1 || checked) { + if(settings.checked.indexOf(item) !== -1 || checked) { input.attr('checked', true); } if(checked){ @@ -151,10 +162,13 @@ settings.labels.splice(index,1); } var oldWidth=button.width(); - button.children('span').first().text(settings.labels.length > 0 + button.children('span').first().text(settings.labels.length > 0 ? settings.labels.join(', ') : settings.title); - var newOuterWidth=Math.max((button.outerWidth()-2),settings.minOuterWidth)+'px'; + var newOuterWidth=Math.max( + (button.outerWidth()-2), + settings.minOuterWidth + )+'px'; var newWidth=Math.max(button.width(),settings.minWidth); var pos=button.position(); button.css('width',oldWidth); @@ -184,7 +198,7 @@ input.css('width',button.innerWidth()); button.parent().data('preventHide',true); input.keypress(function(event) { - if(event.keyCode == 13) { + if(event.keyCode === 13) { event.preventDefault(); event.stopPropagation(); var value = $(this).val(); @@ -222,7 +236,7 @@ select.append(option); li.prev().children('input').prop('checked', true).trigger('change'); button.parent().data('preventHide',false); - button.children('span').first().text(settings.labels.length > 0 + button.children('span').first().text(settings.labels.length > 0 ? settings.labels.join(', ') : settings.title); if(self.menuDirection === 'up') { @@ -265,9 +279,9 @@ } list.append(list.find('li.creator')); var pos=button.position(); - if(($(document).height() > (button.offset().top+button.outerHeight() + list.children().length * button.height()) - && $(document).height() - button.offset().top > (button.offset().top+button.outerHeight() + list.children().length * button.height())) - || $(document).height()/2 > button.offset().top + if(($(document).height() > (button.offset().top+button.outerHeight() + list.children().length * button.height()) && + $(document).height() - button.offset().top > (button.offset().top+button.outerHeight() + list.children().length * button.height())) || + $(document).height()/2 > button.offset().top ) { list.css({ top:pos.top+button.outerHeight()-5, diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 54b9442af27..0e4c346e8cc 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -38,7 +38,14 @@ var OCdialogs = { * @param modal make the dialog modal */ alert:function(text, title, callback, modal) { - this.message(text, title, 'alert', OCdialogs.OK_BUTTON, callback, modal); + this.message( + text, + title, + 'alert', + OCdialogs.OK_BUTTON, + callback, + modal + ); }, /** * displays info dialog @@ -59,7 +66,14 @@ var OCdialogs = { * @param modal make the dialog modal */ confirm:function(text, title, callback, modal) { - this.message(text, title, 'notice', OCdialogs.YES_NO_BUTTONS, callback, modal); + this.message( + text, + title, + 'notice', + OCdialogs.YES_NO_BUTTONS, + callback, + modal + ); }, /** * displays prompt dialog diff --git a/core/js/octemplate.js b/core/js/octemplate.js index aab705059d2..67aa7d69cce 100644 --- a/core/js/octemplate.js +++ b/core/js/octemplate.js @@ -1,7 +1,8 @@ /** * jQuery plugin for micro templates * - * Strings are automatically escaped, but that can be disabled by setting escapeFunction to null. + * Strings are automatically escaped, but that can be disabled by setting + * escapeFunction to null. * * Usage examples: * @@ -11,13 +12,15 @@ * var htmlStr = '<p>Welcome back {user}</p>'; * $(htmlStr).octemplate({user: 'John Q. Public'}, {escapeFunction: null}); * - * Be aware that the target string must be wrapped in an HTML element for the plugin to work. The following won't work: + * Be aware that the target string must be wrapped in an HTML element for the + * plugin to work. The following won't work: * * var textStr = 'Welcome back {user}'; * $(textStr).octemplate({user: 'John Q. Public'}); * - * For anything larger than one-liners, you can use a simple $.get() ajax request to get the template, - * or you can embed them it the page using the text/template type: + * For anything larger than one-liners, you can use a simple $.get() ajax + * request to get the template, or you can embed them it the page using the + * text/template type: * * <script id="contactListItemTemplate" type="text/template"> * <tr class="contact" data-id="{id}"> diff --git a/core/js/setup.js b/core/js/setup.js index 96719540f96..d28f15a0a03 100644 --- a/core/js/setup.js +++ b/core/js/setup.js @@ -72,7 +72,10 @@ $(document).ready(function() { $('input[type="radio"]').first().click(); } - if (currentDbType === 'sqlite' || (dbtypes.sqlite && currentDbType === undefined)){ + if ( + currentDbType === 'sqlite' || + (dbtypes.sqlite && currentDbType === undefined) + ){ $('#datadirContent').hide(250); $('#databaseBackend').hide(250); $('#databaseField').hide(250); diff --git a/core/js/share.js b/core/js/share.js index 0c6d39e446c..bcc04225b9f 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -7,24 +7,31 @@ OC.Share={ statuses:{}, droppedDown:false, /** - * Loads ALL share statuses from server, stores them in OC.Share.statuses then - * calls OC.Share.updateIcons() to update the files "Share" icon to "Shared" - * according to their share status and share type. + * Loads ALL share statuses from server, stores them in + * OC.Share.statuses then calls OC.Share.updateIcons() to update the + * files "Share" icon to "Shared" according to their share status and + * share type. * * @param itemType item type * @param fileList file list instance, defaults to OCA.Files.App.fileList */ loadIcons:function(itemType, fileList) { // Load all share icons - $.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getItemsSharedStatuses', itemType: itemType }, function(result) { - if (result && result.status === 'success') { - OC.Share.statuses = {}; - $.each(result.data, function(item, data) { - OC.Share.statuses[item] = data; - }); - OC.Share.updateIcons(itemType, fileList); + $.get( + OC.filePath('core', 'ajax', 'share.php'), + { + fetch: 'getItemsSharedStatuses', + itemType: itemType + }, function(result) { + if (result && result.status === 'success') { + OC.Share.statuses = {}; + $.each(result.data, function(item, data) { + OC.Share.statuses[item] = data; + }); + OC.Share.updateIcons(itemType, fileList); + } } - }); + ); }, /** * Updates the files' "Share" icons according to the known @@ -202,19 +209,20 @@ OC.Share={ itemSourceName: itemSourceName, expirationDate: expirationDate }, function (result) { - if (result && result.status === 'success') { - if (callback) { - callback(result.data); - } - } else { - if (result.data && result.data.message) { - var msg = result.data.message; + if (result && result.status === 'success') { + if (callback) { + callback(result.data); + } } else { - var msg = t('core', 'Error'); + if (result.data && result.data.message) { + var msg = result.data.message; + } else { + var msg = t('core', 'Error'); + } + OC.dialogs.alert(msg, t('core', 'Error while sharing')); } - OC.dialogs.alert(msg, t('core', 'Error while sharing')); } - }); + ); }, unshare:function(itemType, itemSource, shareType, shareWith, callback) { $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'unshare', itemType: itemType, itemSource: itemSource, shareType: shareType, shareWith: shareWith }, function(result) { diff --git a/core/js/singleselect.js b/core/js/singleselect.js index e2d94a9f287..c22b5232207 100644 --- a/core/js/singleselect.js +++ b/core/js/singleselect.js @@ -2,7 +2,7 @@ $.fn.singleSelect = function () { return this.each(function (i, select) { var input = $('<input/>'), - inputTooltip = $(select).attr('data-inputtitle'); + inputTooltip = $(select).attr('data-inputtitle'); if (inputTooltip){ input.attr('title', inputTooltip); } @@ -84,5 +84,5 @@ } }); }); - } + }; })(jQuery); diff --git a/core/js/tags.js b/core/js/tags.js index 32a930259a6..dd9ea005302 100644 --- a/core/js/tags.js +++ b/core/js/tags.js @@ -1,7 +1,13 @@ OC.Tags= { edit:function(type, cb) { if(!type && !this.type) { - throw { name: 'MissingParameter', message: t('core', 'The object type is not specified.') }; + throw { + name: 'MissingParameter', + message: t( + 'core', + 'The object type is not specified.' + ) + }; } type = type ? type : this.type; var self = this; @@ -25,11 +31,23 @@ OC.Tags= { }); self.deleteButton = { text: t('core', 'Delete'), - click: function() {self._deleteTags(self, type, self._selectedIds())} + click: function() { + self._deleteTags( + self, + type, + self._selectedIds() + ); + } }; self.addButton = { text: t('core', 'Add'), - click: function() {self._addTag(self, type, self.$taginput.val())} + click: function() { + self._addTag( + self, + type, + self.$taginput.val() + ); + } }; self._fillTagList(type, self.$taglist); @@ -184,7 +202,10 @@ OC.Tags= { type = type ? type : this.type; var defer = $.Deferred(), self = this, - url = OC.generateUrl('/tags/{type}/favorite/{id}/', {type: type, id: id}); + url = OC.generateUrl( + '/tags/{type}/favorite/{id}/', + {type: type, id: id} + ); $.post(url, function(response) { if(response.status === 'success') { defer.resolve(response); @@ -208,7 +229,10 @@ OC.Tags= { type = type ? type : this.type; var defer = $.Deferred(), self = this, - url = OC.generateUrl('/tags/{type}/unfavorite/{id}/', {type: type, id: id}); + url = OC.generateUrl( + '/tags/{type}/unfavorite/{id}/', + {type: type, id: id} + ); $.post(url, function(response) { if(response.status === 'success') { defer.resolve(); diff --git a/core/js/tests/specHelper.js b/core/js/tests/specHelper.js index b9be9188a4e..fc5043c2f49 100644 --- a/core/js/tests/specHelper.js +++ b/core/js/tests/specHelper.js @@ -89,7 +89,8 @@ window.oc_defaults = {}; "Content-Type": "application/json" }, '{"data": [], "plural_form": "nplurals=2; plural=(n != 1);"}' - ]); + ] + ); // make it globally available, so that other tests can define // custom responses diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js index 47e5ebfed55..c8e819f7dc5 100644 --- a/core/js/tests/specs/coreSpec.js +++ b/core/js/tests/specs/coreSpec.js @@ -193,24 +193,24 @@ describe('Core base tests', function() { unicode: '汉字' })).toEqual('unicode=%E6%B1%89%E5%AD%97'); expect(OC.buildQueryString({ - b: 'spaace value', - 'space key': 'normalvalue', - 'slash/this': 'amp&ersand' + b: 'spaace value', + 'space key': 'normalvalue', + 'slash/this': 'amp&ersand' })).toEqual('b=spaace%20value&space%20key=normalvalue&slash%2Fthis=amp%26ersand'); }); it('Encodes data types and empty values', function() { expect(OC.buildQueryString({ 'keywithemptystring': '', - 'keywithnull': null, - 'keywithundefined': null, + 'keywithnull': null, + 'keywithundefined': null, something: 'else' })).toEqual('keywithemptystring=&keywithnull&keywithundefined&something=else'); expect(OC.buildQueryString({ - 'booleanfalse': false, + 'booleanfalse': false, 'booleantrue': true })).toEqual('booleanfalse=false&booleantrue=true'); expect(OC.buildQueryString({ - 'number': 123 + 'number': 123 })).toEqual('number=123'); }); }); diff --git a/core/js/visitortimezone.js b/core/js/visitortimezone.js index d9b63a10879..9146e00aade 100644 --- a/core/js/visitortimezone.js +++ b/core/js/visitortimezone.js @@ -7,4 +7,5 @@ $(document).ready(function () { if ($loginForm.length) { $loginForm.find('input#submit').prop('disabled', false); } -}); + } +); |