fix downloading of files in files app
This commit is contained in:
parent
ebd82ee772
commit
0249a72cab
|
@ -135,7 +135,7 @@ $(document).ready(function(){
|
||||||
var downloadScope = 'file';
|
var downloadScope = 'file';
|
||||||
}
|
}
|
||||||
FileActions.register(downloadScope,'Download',function(){return OC.imagePath('core','actions/download')},function(filename){
|
FileActions.register(downloadScope,'Download',function(){return OC.imagePath('core','actions/download')},function(filename){
|
||||||
window.location='ajax/download.php?files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent($('#dir').val());
|
window.location=OC.filePath('files', 'ajax', 'download.php?files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent($('#dir').val()));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -140,7 +140,7 @@ $(document).ready(function() {
|
||||||
var dir=$('#dir').val()||'/';
|
var dir=$('#dir').val()||'/';
|
||||||
$('#notification').text(t('files','generating ZIP-file, it may take some time.'));
|
$('#notification').text(t('files','generating ZIP-file, it may take some time.'));
|
||||||
$('#notification').fadeIn();
|
$('#notification').fadeIn();
|
||||||
window.location='ajax/download.php?files='+encodeURIComponent(files)+'&dir='+encodeURIComponent(dir);
|
window.location=OC.filePath('files', 'ajax', 'download.php?files='+encodeURIComponent(files)+'&dir='+encodeURIComponent(dir));
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -418,7 +418,7 @@ var folderDropOptions={
|
||||||
var target=$(this).text().trim();
|
var target=$(this).text().trim();
|
||||||
var dir=$('#dir').val();
|
var dir=$('#dir').val();
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: 'ajax/move.php',
|
url: OC.filePath('files', 'ajax', 'move.php'),
|
||||||
data: "dir="+encodeURIComponent(dir)+"&file="+encodeURIComponent(file)+'&target='+encodeURIComponent(dir)+'/'+encodeURIComponent(target),
|
data: "dir="+encodeURIComponent(dir)+"&file="+encodeURIComponent(file)+'&target='+encodeURIComponent(dir)+'/'+encodeURIComponent(target),
|
||||||
complete: function(data){boolOperationFinished(data, function(){
|
complete: function(data){boolOperationFinished(data, function(){
|
||||||
var el = $('#fileList tr').filterAttr('data-file',file).find('td.filename');
|
var el = $('#fileList tr').filterAttr('data-file',file).find('td.filename');
|
||||||
|
@ -444,7 +444,7 @@ var crumbDropOptions={
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: 'ajax/move.php',
|
url: OC.filePath('files', 'ajax', 'move.php'),
|
||||||
data: "dir="+encodeURIComponent(dir)+"&file="+encodeURIComponent(file)+'&target='+encodeURIComponent(target),
|
data: "dir="+encodeURIComponent(dir)+"&file="+encodeURIComponent(file)+'&target='+encodeURIComponent(target),
|
||||||
complete: function(data){boolOperationFinished(data, function(){
|
complete: function(data){boolOperationFinished(data, function(){
|
||||||
FileList.remove(file);
|
FileList.remove(file);
|
||||||
|
|
|
@ -53,12 +53,13 @@ OC={
|
||||||
filePath:function(app,type,file){
|
filePath:function(app,type,file){
|
||||||
var isCore=OC.coreApps.indexOf(app)!=-1;
|
var isCore=OC.coreApps.indexOf(app)!=-1;
|
||||||
var link=OC.webroot;
|
var link=OC.webroot;
|
||||||
if((file.substring(file.length-3) == 'php' || file.substring(file.length-3) == 'css') && !isCore){
|
var splitted = file.split('?');
|
||||||
|
if((splitted[0].substring(splitted[0].length-3) == 'php' || splitted[0].substring(splitted[0].length-3) == 'css') && !isCore){
|
||||||
link+='/?app=' + app + '&getfile=';
|
link+='/?app=' + app + '&getfile=';
|
||||||
if(type){
|
if(type){
|
||||||
link+=encodeURI(type + '/');
|
link+=encodeURI(type + '/');
|
||||||
}
|
}
|
||||||
link+= file;
|
link+= file + '?' + splitted[1];
|
||||||
}else if(file.substring(file.length-3) != 'php' && !isCore){
|
}else if(file.substring(file.length-3) != 'php' && !isCore){
|
||||||
link=OC.appswebroot;
|
link=OC.appswebroot;
|
||||||
link+='/';
|
link+='/';
|
||||||
|
|
Loading…
Reference in New Issue