diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2012-09-16 17:14:04 +0200 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2012-09-16 17:14:04 +0200 |
| commit | f17555285e26b692170a724b3141c7304f252c95 (patch) | |
| tree | b5417275674e166f125ee4c473683fe96308b39a | |
| parent | 9d533fcd722512cfbc0b7bc547cc4eb822eaafdf (diff) | |
| parent | 7da3492ab5afc2b3df95ddbc30be13edf6db6c32 (diff) | |
| download | nextcloud-server-f17555285e26b692170a724b3141c7304f252c95.tar.gz nextcloud-server-f17555285e26b692170a724b3141c7304f252c95.zip | |
Merge branch 'master' of https://github.com/owncloud/core
| -rw-r--r-- | apps/files/ajax/newfile.php | 2 | ||||
| -rw-r--r-- | apps/files/js/files.js | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php index 4619315ce09..495c8212163 100644 --- a/apps/files/ajax/newfile.php +++ b/apps/files/ajax/newfile.php @@ -67,7 +67,7 @@ if($source) { $result=OC_Filesystem::file_put_contents($target, $sourceStream); if($result) { $mime=OC_Filesystem::getMimetype($target); - $eventSource->send('success', $mime); + $eventSource->send('success', array('mime'=>$mime, 'size'=>OC_Filesystem::filesize($target))); } else { $eventSource->send('error', "Error while downloading ".$source. ' to '.$target); } diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 101e2bad2e4..30c9b848434 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -556,10 +556,12 @@ $(document).ready(function() { eventSource.listen('progress',function(progress){ $('#uploadprogressbar').progressbar('value',progress); }); - eventSource.listen('success',function(mime){ + eventSource.listen('success',function(data){ + var mime=data.mime; + var size=data.size; $('#uploadprogressbar').fadeOut(); var date=new Date(); - FileList.addFile(localName,0,date,false,hidden); + FileList.addFile(localName,size,date,false,hidden); var tr=$('tr').filterAttr('data-file',localName); tr.data('mime',mime); getMimeIcon(mime,function(path){ |