diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-03-26 14:14:30 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-03-26 14:14:30 +0100 |
| commit | e0e5cb73bf27f96d92140a7ae3b61dface438a09 (patch) | |
| tree | 15103ec906e1a993f85157478c45afdfc15a19ec | |
| parent | d49e8ffb5ed4be03f05b607d9b673e4543b94d21 (diff) | |
| download | nextcloud-server-e0e5cb73bf27f96d92140a7ae3b61dface438a09.tar.gz nextcloud-server-e0e5cb73bf27f96d92140a7ae3b61dface438a09.zip | |
fixes #1461
| -rw-r--r-- | apps/files/js/files.js | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 82069e3bc57..c41f89e074a 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; |