Skip to content
Snippets Groups Projects
Commit 1e1e8ae3 authored by Michael Gapczynski's avatar Michael Gapczynski
Browse files

Don't show the expiration option until a share occurs, bug fix for oc-1724

parent 39e587b5
Branches
No related tags found
No related merge requests found
......@@ -17,4 +17,4 @@ a.unshare { float:right; display:inline; padding:.3em 0 0 .3em !important; opaci
a.unshare:hover { opacity:1; }
#link { border-top:1px solid #ddd; padding-top:0.5em; }
#dropdown input[type="text"], #dropdown input[type="password"] { width:90%; }
#linkText, #linkPass { display:none; }
#linkText, #linkPass, #expiration { display:none; }
......@@ -283,6 +283,7 @@ OC.Share={
html += '</div>';
html += '</li>';
$(html).appendTo('#shareWithList');
$('#expiration').show();
}
},
showLink:function(itemSource, password) {
......@@ -302,6 +303,7 @@ OC.Share={
$('#linkPass').show('blind');
$('#linkPassText').attr('placeholder', 'Password protected');
}
$('#expiration').show();
},
hideLink:function() {
$('#linkText').hide('blind');
......@@ -379,6 +381,9 @@ $(document).ready(function() {
var index = OC.Share.itemShares[shareType].indexOf(shareWith);
OC.Share.itemShares[shareType].splice(index, 1);
OC.Share.updateIcon(itemType, itemSource);
if (typeof OC.Share.statuses[itemSource] === 'undefined') {
$('#expiration').hide();
}
});
});
......@@ -422,6 +427,9 @@ $(document).ready(function() {
// Delete private link
OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
OC.Share.hideLink();
if (typeof OC.Share.statuses[itemSource] === 'undefined') {
$('#expiration').hide();
}
});
}
});
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment