mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7569 from owncloud/scrutinizer-tabs 

fix some spaces to tabs issues reported by Scrutinizer
This commit is contained in:
Jan-Christoph Borchardt 2014-03-05 18:10:01 +01:00
parent 0980c48526 7ad7f94797
commit 36fcb0fb4e
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files_external/js/settings.js
View File

@ -264,7 +264,7 @@ $(document).ready(function() {
OC.MountConfig.saveStorage($(this).parent().parent()); OC.MountConfig.saveStorage($(this).parent().parent());
}); });
$('#sslCertificate').on('click', 'td.remove>img', function() { $('#sslCertificate').on('click', 'td.remove>img', function() {
var $tr = $(this).parent().parent(); var $tr = $(this).parent().parent();
var row = this.parentNode.parentNode; var row = this.parentNode.parentNode;
$.post(OC.filePath('files_external', 'ajax', 'removeRootCertificate.php'), {cert: row.id}); $.post(OC.filePath('files_external', 'ajax', 'removeRootCertificate.php'), {cert: row.id});

26
core/js/router.js
View File

@ -32,37 +32,37 @@ OC.Router = {
var optional = true; var optional = true;
$(route.tokens).each(function(i, token) { $(route.tokens).each(function(i, token) {
if ('text' === token[0]) { if ('text' === token[0]) {
url = token[1] + url; url = token[1] + url;
optional = false; optional = false;
return; return;
} }
if ('variable' === token[0]) { if ('variable' === token[0]) {
if (false === optional || !(token[3] in route.defaults) if (false === optional || !(token[3] in route.defaults)
|| ((token[3] in params) && params[token[3]] != route.defaults[token[3]])) { || ((token[3] in params) && params[token[3]] != route.defaults[token[3]])) {
var value; var value;
if (token[3] in params) { if (token[3] in params) {
value = params[token[3]]; value = params[token[3]];
delete unusedParams[token[3]]; delete unusedParams[token[3]];
} else if (token[3] in route.defaults) { } else if (token[3] in route.defaults) {
value = route.defaults[token[3]]; value = route.defaults[token[3]];
} else if (optional) { } else if (optional) {
return; return;
} else { } else {
throw new Error('The route "' + name + '" requires the parameter "' + token[3] + '".'); throw new Error('The route "' + name + '" requires the parameter "' + token[3] + '".');
} }
var empty = true === value || false === value || '' === value; var empty = true === value || false === value || '' === value;
if (!empty || !optional) { if (!empty || !optional) {
url = token[1] + encodeURIComponent(value).replace(/%2F/g, '/') + url; url = token[1] + encodeURIComponent(value).replace(/%2F/g, '/') + url;
} }
optional = false; optional = false;
} }
return; return;
} }
throw new Error('The token type "' + token[0] + '" is not supported.'); throw new Error('The token type "' + token[0] + '" is not supported.');

4
core/js/share.js
View File

@ -584,8 +584,8 @@ $(document).ready(function() {
$(checkboxes).filter('input[name="edit"]').attr('checked', false); $(checkboxes).filter('input[name="edit"]').attr('checked', false);
// Check Edit if Create, Update, or Delete is checked // Check Edit if Create, Update, or Delete is checked
} else if (($(this).attr('name') == 'create' } else if (($(this).attr('name') == 'create'
|| $(this).attr('name') == 'update' || $(this).attr('name') == 'update'
|| $(this).attr('name') == 'delete')) || $(this).attr('name') == 'delete'))
{ {
$(checkboxes).filter('input[name="edit"]').attr('checked', true); $(checkboxes).filter('input[name="edit"]').attr('checked', true);
} }