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

Merge branch 'libasys-patch-1'

This commit is contained in:
Morris Jobke 2014-05-19 13:14:33 +02:00
parent 48977c8579 9e1d47bd90
commit 1cff73b615
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/js/share.js
View File

@ -495,6 +495,10 @@ OC.Share={
showLink:function(token, password, itemSource) { showLink:function(token, password, itemSource) {
OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = true; OC.Share.itemShares[OC.Share.SHARE_TYPE_LINK] = true;
$('#linkCheckbox').attr('checked', true); $('#linkCheckbox').attr('checked', true);
//check itemType
var linkSharetype=$('#dropdown').data('item-type');
if (! token) { if (! token) {
//fallback to pre token link //fallback to pre token link
var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file'); var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
@ -508,7 +512,15 @@ OC.Share={
var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&'+type+'='+encodeURIComponent(file); var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&'+type+'='+encodeURIComponent(file);
} else { } else {
//TODO add path param when showing a link to file in a subfolder of a public link share //TODO add path param when showing a link to file in a subfolder of a public link share
var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&t='+token; var service='';
if(linkSharetype === 'folder' || linkSharetype === 'file'){
service='files';
}else{
service=linkSharetype;
}
var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service='+service+'&t='+token;
} }
$('#linkText').val(link); $('#linkText').val(link);
$('#linkText').show('blind'); $('#linkText').show('blind');