diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars index fc316db2..93ab9ec8 100644 --- a/views/default-mobile.handlebars +++ b/views/default-mobile.handlebars @@ -1,4 +1,4 @@ - + @@ -2694,7 +2694,7 @@ d3filetreelocation2.push(d3filetreelocation[i]); if ((folderdepth == 1)) { var sp = d3filetreelocation[i].split('/'); - publicPath = window.location + sp[0] + 'files/' + sp[2]; + publicPath = window.location.origin + '/' + sp[0] + 'files/' + sp[2]; if (d3filetreelocation[i] === userinfo._id) { d3filetreelinkpath += 'self'; } else { d3filetreelinkpath += (sp[0] + '/' + sp[2]); } } else { if (d3filetreelinkpath != '') { d3filetreelinkpath += '/' + d3filetreelocation[i]; if (folderdepth > 2) { publicPath += '/' + d3filetreelocation[i]; } } @@ -2788,7 +2788,7 @@ fullPath += ' / ' + filetreelocation[i]; if ((folderdepth == 1)) { var sp = filetreelocation[i].split('/'); - publicPath = window.location + sp[0] + 'files/' + sp[2]; + publicPath = window.location.origin + '/' + sp[0] + 'files/' + sp[2]; //if (filetreelocation[i] === userinfo._id) { filetreelinkpath += 'self'; } else { filetreelinkpath += (sp[0] + '/' + sp[2]); } filetreelinkpath += filetreelocation[i]; } else { diff --git a/views/default.handlebars b/views/default.handlebars index d95d349f..02ec6fcd 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -14729,7 +14729,7 @@ fullPath += ' / ' + filetreelocation[i]; if ((folderdepth == 1)) { var sp = filetreelocation[i].split('/'); - publicPath = (("" + window.location).split('?')[0]) + sp[0] + 'files/' + sp[2]; + publicPath = window.location.origin + '/' + sp[0] + 'files/' + sp[2]; //if (filetreelocation[i] === userinfo._id) { filetreelinkpath += 'self'; } else { filetreelinkpath += (sp[0] + '/' + sp[2]); } filetreelinkpath += filetreelocation[i]; } else { @@ -17394,7 +17394,7 @@ d3filetreelocation2.push(d3filetreelocation[i]); if ((folderdepth == 1)) { var sp = d3filetreelocation[i].split('/'); - publicPath = window.location + sp[0] + 'files/' + sp[2]; + publicPath = window.location.origin + '/' + sp[0] + 'files/' + sp[2]; if (d3filetreelocation[i] === userinfo._id) { d3filetreelinkpath += 'self'; } else { d3filetreelinkpath += (sp[0] + '/' + sp[2]); } } else { if (d3filetreelinkpath != '') { d3filetreelinkpath += '/' + d3filetreelocation[i]; if (folderdepth > 2) { publicPath += '/' + d3filetreelocation[i]; } }