aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-04-17 08:44:39 +0200
committerGitHub <noreply@github.com>2019-04-17 08:44:39 +0200
commit22d54078fcab0619b6243ec371ba3c8ba6c7dd62 (patch)
tree05beed1bf3fddcacdd83dcd1780521c4cc42cc8a
parent04d1177904335e2139b5f10769f2fe2a19c8a9e7 (diff)
parent3ba9f6bd6d5758f43f621b57c53f401ad5b2dc0b (diff)
downloadnextcloud-server-22d54078fcab0619b6243ec371ba3c8ba6c7dd62.tar.gz
nextcloud-server-22d54078fcab0619b6243ec371ba3c8ba6c7dd62.zip
Merge pull request #15128 from nextcloud/backport/15123/stable15
[stable15] Improve the share link password error feedback with a red border
-rw-r--r--apps/files_sharing/css/sharetabview.scss6
-rw-r--r--core/js/sharedialoglinkshareview.js4
2 files changed, 10 insertions, 0 deletions
diff --git a/apps/files_sharing/css/sharetabview.scss b/apps/files_sharing/css/sharetabview.scss
index f698697407a..9387b5cd314 100644
--- a/apps/files_sharing/css/sharetabview.scss
+++ b/apps/files_sharing/css/sharetabview.scss
@@ -68,6 +68,12 @@
}
.popovermenu {
.linkPassMenu {
+ input.error {
+ border-color: var(--color-error) !important;
+ &[type="submit"] {
+ border-left: none;
+ }
+ }
.share-pass-submit {
width: auto !important;
}
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index eaea8c9176f..1c1f5d79356 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -352,6 +352,7 @@
}
var $input = $li.find('.linkPassText');
$input.removeClass('error');
+ $input.parent().find('input').removeClass('error');
var password = $input.val();
if ($li.find('.linkPassText').attr('placeholder') === PASSWORD_PLACEHOLDER_MESSAGE_OPTIONAL) {
@@ -380,6 +381,9 @@
$loading.removeClass('inlineblock').addClass('hidden');
},
error: function(model, msg) {
+ // Add visual feedback to both the input and the submit button
+ $input.parent().find('input').addClass('error');
+
// destroy old tooltips
var $container = $input.parent();
$container.tooltip('destroy');