diff options
author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-01-30 13:53:43 +0100 |
---|---|---|
committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-01-30 13:53:43 +0100 |
commit | 284e69073782d634dbee9368a81607ae2afebc7b (patch) | |
tree | 26c40b2c76e9a70c72d24a1a8336d13b7689c5c3 /apps/files/js/files.js | |
parent | 3bafa87a1223d18e7f772c9551f17aaf7bcc7abb (diff) | |
parent | 5761bd771f4142394a00083712b63e77f8976946 (diff) | |
download | nextcloud-server-284e69073782d634dbee9368a81607ae2afebc7b.tar.gz nextcloud-server-284e69073782d634dbee9368a81607ae2afebc7b.zip |
Merge branch 'master' into navigation
Diffstat (limited to 'apps/files/js/files.js')
-rw-r--r-- | apps/files/js/files.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 6486468eafd..c817d8431e2 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -462,6 +462,10 @@ $(document).ready(function() { $('#uploadprogressbar').progressbar('value',progress); }, start: function(e, data) { + //IE < 10 does not fire the necessary events for the progress bar. + if($.browser.msie && parseInt($.browser.version) < 10) { + return; + } $('#uploadprogressbar').progressbar({value:0}); $('#uploadprogressbar').fadeIn(); if(data.dataType != 'iframe ') { |