From 1dd79cc8e16f2972b8a8fea03f4e8ecfc1db5ac9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Tue, 4 Dec 2012 14:06:44 +0100
Subject: [PATCH] set password for shared links when the user press enter and
when he leaves the password field
---
core/js/share.js | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/core/js/share.js b/core/js/share.js
index df5ebf008b..984fce047b 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -520,16 +520,26 @@ $(document).ready(function() {
$('#linkPass').toggle('blind');
});
- $('#linkPassText').live('focusout', function(event) {
- var itemType = $('#dropdown').data('item-type');
- var itemSource = $('#dropdown').data('item-source');
- OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
- $('#linkPassText').val('');
- $('#linkPassText').attr('placeholder', t('core', 'Password protected'));
- });
- $('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+ $('#linkPassText').live('focusout keyup', function(event) {
+ if ( event.type == 'focusout' || event.keyCode == 13 ) {
+ var itemType = $('#dropdown').data('item-type');
+ var itemSource = $('#dropdown').data('item-source');
+ if ( $('#linkPassText').attr('passwordChanged') == 'true' ) {
+ OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
+ $('#linkPassText').val('');
+ $('#linkPassText').attr('placeholder', t('core', 'Password protected'));
+ $('#linkPassText').attr('passwordChanged', 'false');
+ });
+ }
+ }
});
+ $('#linkPassText').live('focusout keyup', function(event) {
+ if ( event.keyCode != 13 ) {
+ $('#linkPassText').attr('passwordChanged', 'true');
+ }
+ });
+
$('#expirationCheckbox').live('click', function() {
if (this.checked) {
OC.Share.showExpirationDate('');
--
GitLab