show the size of new files when using New->From Url

diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 4619315ce0913e230fe0773fdd2af7d131dc2252..495c821216367fa864b73e2d698d3ce366ca2817 100644 (file)
--- 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 101e2bad2e4c3d898ad5e96b613527854e453883..30c9b8484340ce464b6066ebae3cdc6788694d47 100644 (file)
--- 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){