mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Michael Gapczynski 2012-09-19 01:02:57 -04:00
parent 39e587b52c
commit 1e1e8ae3b5
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/css/share.css
View File

@ -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; }

8
core/js/share.js
View File

@ -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();
}
});
}
});