From e0e5cb73bf27f96d92140a7ae3b61dface438a09 Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Tue, 26 Mar 2013 14:14:30 +0100 Subject: [PATCH 1/2] fixes #1461 --- apps/files/js/files.js | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 82069e3bc5..c41f89e074 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -459,6 +459,10 @@ $(document).ready(function() { // TODO: show nice progress bar in file row }, progressall: function(e, data) { + //IE < 10 does not fire the necessary events for the progress bar. + if($.browser.msie && parseInt($.browser.version) < 10) { + return; + } var progress = (data.loaded/data.total)*100; $('#uploadprogressbar').progressbar('value',progress); }, @@ -477,6 +481,11 @@ $(document).ready(function() { if(data.dataType != 'iframe ') { $('#upload input.stop').hide(); } + //IE < 10 does not fire the necessary events for the progress bar. + if($.browser.msie && parseInt($.browser.version) < 10) { + return; + } + $('#uploadprogressbar').progressbar('value',100); $('#uploadprogressbar').fadeOut(); } @@ -637,12 +646,19 @@ $(document).ready(function() { localName=(localName.match(/:\/\/(.[^/]+)/)[1]).replace('www.',''); } localName = getUniqueName(localName); - $('#uploadprogressbar').progressbar({value:0}); - $('#uploadprogressbar').fadeIn(); + //IE < 10 does not fire the necessary events for the progress bar. + if($.browser.msie && parseInt($.browser.version) < 10) { + } else { + $('#uploadprogressbar').progressbar({value:0}); + $('#uploadprogressbar').fadeIn(); + } var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName}); eventSource.listen('progress',function(progress){ - $('#uploadprogressbar').progressbar('value',progress); + if($.browser.msie && parseInt($.browser.version) < 10) { + } else { + $('#uploadprogressbar').progressbar('value',progress); + } }); eventSource.listen('success',function(data){ var mime=data.mime; From 586a47b186c96cea2cb0e3182fb559e79f1730be Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Tue, 26 Mar 2013 21:28:01 +0100 Subject: [PATCH 2/2] fixes #1463 - file size is now displayed correctly in IE8 --- apps/files/js/files.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/files/js/files.js b/apps/files/js/files.js index c41f89e074..606f4a5e3f 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -407,7 +407,9 @@ $(document).ready(function() { $('tr').filterAttr('data-file',file.name).data('mime',file.mime).data('id',file.id); var size = $('tr').filterAttr('data-file',file.name).find('td.filesize').text(); if(size==t('files','Pending')){ - $('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size); + var sizeElement = $('tr').filterAttr('data-file',file.name).find('td.filesize'); + sizeElement.text(simpleFileSize(file.size)); + sizeElement.attr('title',humanFileSize(file.size)); } //TODO update file upload size limit FileList.loadingDone(file.name, file.id); @@ -438,7 +440,9 @@ $(document).ready(function() { $('tr').filterAttr('data-file',file.name).data('mime',file.mime).data('id',file.id); var size = $('tr').filterAttr('data-file',file.name).find('td.filesize').text(); if(size==t('files','Pending')){ - $('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size); + var sizeElement = $('tr').filterAttr('data-file',file.name).find('td.filesize'); + sizeElement.text(simpleFileSize(file.size)); + sizeElement.attr('title',humanFileSize(file.size)); } //TODO update file upload size limit FileList.loadingDone(file.name, file.id);