From 08fd4b38f895a5e9a91cdc476103c26be68dda80 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Mon, 28 Sep 2015 20:44:33 +0200 Subject: [PATCH 1/2] Do noy allow empty urls to be submitted in "add to your owncloud" Fixes #19382 --- apps/files_sharing/js/public.js | 8 ++++++++ apps/files_sharing/templates/public.php | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 6a6095317a..41333f1a08 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -228,6 +228,14 @@ OCA.Sharing.PublicApp = { OCA.Sharing.PublicApp._saveToOwnCloud(remote, token, owner, name, isProtected); }); + $('#remote_address').on("change keyup paste", function() { + if ($(this).val() === '') { + $('#save-button-confirm').prop('disabled', true); + } else { + $('#save-button-confirm').prop('disabled', false); + } + }); + $('#save #save-button').click(function () { $(this).hide(); $('.save-form').css('display', 'inline'); diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index cde28c80fc..06d797c3c6 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -76,7 +76,7 @@ $thumbSize = 1024; From 2d1214d21d32c18d9aa6cada30f92a32bd809cdf Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 30 Sep 2015 15:28:28 +0200 Subject: [PATCH 2/2] adjust style of disabled button --- apps/files_sharing/css/public.css | 10 ++++++++++ apps/files_sharing/js/public.js | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index a5cf57d0ac..2b7e84c987 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -134,9 +134,19 @@ thead { margin: 2px 0 !important; } +#save-button-confirm:disabled, +#save-button-confirm:disabled:hover, +#save-button-confirm:disabled:focus { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)"; + filter: alpha(opacity=20); + opacity: .2; + cursor: default; +} + #save-button-confirm:hover, #save-button-confirm:focus { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter: alpha(opacity=100); opacity: 1; + cursor: pointer; } diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js index 41333f1a08..2ba1a92af3 100644 --- a/apps/files_sharing/js/public.js +++ b/apps/files_sharing/js/public.js @@ -228,7 +228,7 @@ OCA.Sharing.PublicApp = { OCA.Sharing.PublicApp._saveToOwnCloud(remote, token, owner, name, isProtected); }); - $('#remote_address').on("change keyup paste", function() { + $('#remote_address').on("keyup paste", function() { if ($(this).val() === '') { $('#save-button-confirm').prop('disabled', true); } else {