diff options
| author | Robin <robin@Amaya.(none)> | 2010-04-28 12:01:05 +0200 |
|---|---|---|
| committer | Robin <robin@Amaya.(none)> | 2010-04-28 12:01:05 +0200 |
| commit | fb498b9534b545c0e66cb82304e64f199c77a463 (patch) | |
| tree | 5dee29e558a580fe57d777aa41b493671b0f5a3b /js/filebrowser.js | |
| parent | 09add452d93f185d89ab51b67cda2fc384772db5 (diff) | |
| parent | 854e0c5a9c9060e827fbbfddffeeeadfc2d27278 (diff) | |
| download | nextcloud-server-fb498b9534b545c0e66cb82304e64f199c77a463.tar.gz nextcloud-server-fb498b9534b545c0e66cb82304e64f199c77a463.zip | |
fix merge conflicts
Diffstat (limited to 'js/filebrowser.js')
| -rw-r--r-- | js/filebrowser.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/filebrowser.js b/js/filebrowser.js index f12cec44143..cc03fe33156 100644 --- a/js/filebrowser.js +++ b/js/filebrowser.js @@ -129,16 +129,16 @@ OC_FILES.browser.files.show=function(parent,fileList){ for(name in fileList){ file=fileList[name]; if(!OC_FILES.browser.files.fileNodes[file.name]){ - OC_FILES.browser.files.add(file.name,file.type,file.size,file.date); + OC_FILES.browser.files.add(file.name,file.type,file.size,file.date,file.mime); } } } } -OC_FILES.browser.files.add=function(name,type,size,date){ +OC_FILES.browser.files.add=function(name,type,size,date,mime){ if(name){ if(!size) size=0; if(!date) date=getTimeString(); - OC_FILES.files[name]=new OC_FILES.file(OC_FILES.dir,name,type); + OC_FILES.files[name]=new OC_FILES.file(OC_FILES.dir,name,type,mime); tr=document.createElement('tr'); OC_FILES.browser.files.fileNodes[name]=tr; OC_FILES.browser.files.tbody.appendChild(tr); |