fixes #1461

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 82069e3bc578b20827879e5a40dc1ba60edaa456..c41f89e074ae2a72861de8b63d7d97274a14a0a6 100644 (file)
--- 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;