diff options
| -rw-r--r-- | apps/files_external/js/settings.js | 2 | ||||
| -rw-r--r-- | core/js/router.js | 26 | ||||
| -rw-r--r-- | core/js/share.js | 4 |
3 files changed, 16 insertions, 16 deletions
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js index dbc9f548292..cd2a3103eb7 100644 --- a/apps/files_external/js/settings.js +++ b/apps/files_external/js/settings.js @@ -264,7 +264,7 @@ $(document).ready(function() { 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 row = this.parentNode.parentNode; $.post(OC.filePath('files_external', 'ajax', 'removeRootCertificate.php'), {cert: row.id}); diff --git a/core/js/router.js b/core/js/router.js index e6ef54a1864..e764783ca84 100644 --- a/core/js/router.js +++ b/core/js/router.js @@ -32,37 +32,37 @@ OC.Router = { var optional = true; $(route.tokens).each(function(i, token) { if ('text' === token[0]) { - url = token[1] + url; - optional = false; + url = token[1] + url; + optional = false; - return; + return; } if ('variable' === token[0]) { - if (false === optional || !(token[3] in route.defaults) - || ((token[3] in params) && params[token[3]] != route.defaults[token[3]])) { + if (false === optional || !(token[3] in route.defaults) + || ((token[3] in params) && params[token[3]] != route.defaults[token[3]])) { var value; if (token[3] in params) { - value = params[token[3]]; - delete unusedParams[token[3]]; + value = params[token[3]]; + delete unusedParams[token[3]]; } else if (token[3] in route.defaults) { - value = route.defaults[token[3]]; + value = route.defaults[token[3]]; } else if (optional) { - return; + return; } 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; if (!empty || !optional) { - url = token[1] + encodeURIComponent(value).replace(/%2F/g, '/') + url; + url = token[1] + encodeURIComponent(value).replace(/%2F/g, '/') + url; } optional = false; - } + } - return; + return; } throw new Error('The token type "' + token[0] + '" is not supported.'); diff --git a/core/js/share.js b/core/js/share.js index 0939259b7da..129e50b22d5 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -584,8 +584,8 @@ $(document).ready(function() { $(checkboxes).filter('input[name="edit"]').attr('checked', false); // Check Edit if Create, Update, or Delete is checked } else if (($(this).attr('name') == 'create' - || $(this).attr('name') == 'update' - || $(this).attr('name') == 'delete')) + || $(this).attr('name') == 'update' + || $(this).attr('name') == 'delete')) { $(checkboxes).filter('input[name="edit"]').attr('checked', true); } |