diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-01-30 02:48:12 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-01-30 02:48:12 -0800 |
| commit | 5761bd771f4142394a00083712b63e77f8976946 (patch) | |
| tree | d683f7b2cf70f604b9c70d541cb4147dcaf571a3 /apps/files/js/files.js | |
| parent | a6040d0cc77aa1888637429402d4387b7fb616da (diff) | |
| parent | 5e16510a5360e256a6dea7389a48d06ec85b5f8a (diff) | |
| download | nextcloud-server-5761bd771f4142394a00083712b63e77f8976946.tar.gz nextcloud-server-5761bd771f4142394a00083712b63e77f8976946.zip | |
Merge pull request #1227 from owncloud/hideuploadprogresscancelinielt10
hide upload progress bar and cancel action in IE < 10
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 ') { |