diff --git a/js/filebrowser.js b/js/filebrowser.js index 548b7c8492..18567f202c 100755 --- a/js/filebrowser.js +++ b/js/filebrowser.js @@ -476,8 +476,8 @@ OC_FILES.browser.rename_cancel=function(file){ OC_FILES.browser.showactions=function(file,hide){ var node=document.getElementById(file); if(node &&(node.actionsshown || hide===true)){ - if(node.actionsdiv){ - node.removeChild(node.actionsdiv); + if(node.actionsshown){ + node.actionsdiv.parentNode.removeChild(node.actionsdiv); } node.actionsdiv=null; node.actionsshown=false diff --git a/js/lib_files.js b/js/lib_files.js index d1480e3663..c66fc8d121 100755 --- a/js/lib_files.js +++ b/js/lib_files.js @@ -88,7 +88,7 @@ OC_FILES.getdirectorycontent=function(dir,callback,refresh){ OC_FILES.dir=''; OC_FILES.get=function(dir,file){ - window.location='files/get_file.php?dir='+encodeURIComponent(dir)+'&files='+encodeURIComponent(file); + window.location='files/api.php?action=get&dir='+encodeURIComponent(dir)+'&files='+encodeURIComponent(file); } OC_FILES.upload=function(dir,iframeId){