diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-04-16 17:10:14 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-04-16 17:10:14 +0200 |
| commit | e68006c0ce13255bc4858d3a8191746c2c831b00 (patch) | |
| tree | cabef0f4367e3cdb2043cd18586c057d8ac6da01 /core | |
| parent | f6551d214fa4b947832ed83e94568fb4bfc0a410 (diff) | |
| parent | 9e9c109390c265cdb63b5788365ce74034009a6c (diff) | |
| download | nextcloud-server-e68006c0ce13255bc4858d3a8191746c2c831b00.tar.gz nextcloud-server-e68006c0ce13255bc4858d3a8191746c2c831b00.zip | |
Merge pull request #8157 from owncloud/share-expiration-smooth-hide
Expiration date is hidden smoothly
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/share.js | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/core/js/share.js b/core/js/share.js index 5cabc614563..03202c1a61c 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -500,15 +500,16 @@ OC.Share={ $('#emailPrivateLink #email').hide(); $('#emailPrivateLink #emailButton').hide(); $('#allowPublicUploadWrapper').hide(); + $('#expirationDate').hide(); }, dirname:function(path) { return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, ''); }, showExpirationDate:function(date) { $('#expirationCheckbox').attr('checked', true); - $('#expirationDate').before('<br />'); $('#expirationDate').val(date); - $('#expirationDate').show(); + $('#expirationDate').show('blind'); + $('#expirationDate').css('display','block'); $('#expirationDate').datepicker({ dateFormat : 'dd-mm-yy' }); @@ -578,7 +579,7 @@ $(document).ready(function() { OC.Share.itemShares[shareType].splice(index, 1); OC.Share.updateIcon(itemType, itemSource); if (typeof OC.Share.statuses[itemSource] === 'undefined') { - $('#expiration').hide(); + $('#expiration').hide('blind'); } }); return false; @@ -638,7 +639,7 @@ $(document).ready(function() { OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = false; OC.Share.updateIcon(itemType, itemSource); if (typeof OC.Share.statuses[itemSource] === 'undefined') { - $('#expiration').hide(); + $('#expiration').hide('blind'); } }); } @@ -730,7 +731,7 @@ $(document).ready(function() { if (!result || result.status !== 'success') { OC.dialogs.alert(t('core', 'Error unsetting expiration date'), t('core', 'Error')); } - $('#expirationDate').hide(); + $('#expirationDate').hide('blind'); }); } }); |