From 7ecbaef16c378a7fa972d9e9f3f81491552d8a4e Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Thu, 28 Mar 2013 19:13:37 +0100 Subject: [PATCH] use css browser switch instead of deprecated jquery browser detection --- apps/files/js/files.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 5060fe93f1d..6ae113a062c 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -290,7 +290,7 @@ $(document).ready(function() { } //show cancel button - if(data.dataType !== 'iframe') { + if($('html.lte9').length === 0 && data.dataType !== 'iframe') { $('#uploadprogresswrapper input.stop').show(); } }, @@ -300,7 +300,7 @@ $(document).ready(function() { */ start: function(e) { //IE < 10 does not fire the necessary events for the progress bar. - if($.browser.msie && parseInt($.browser.version) < 10) { + if($('html.lte9').length > 0) { return; } $('#uploadprogressbar').progressbar({value:0}); @@ -327,7 +327,7 @@ $(document).ready(function() { }, progressall: function(e, data) { //IE < 10 does not fire the necessary events for the progress bar. - if($.browser.msie && parseInt($.browser.version) < 10) { + if($('html.lte9').length > 0) { return; } var progress = (data.loaded/data.total)*100; @@ -383,7 +383,7 @@ $(document).ready(function() { } //IE < 10 does not fire the necessary events for the progress bar. - if($.browser.msie && parseInt($.browser.version) < 10) { + if($('html.lte9').length > 0) { return; } @@ -548,7 +548,7 @@ $(document).ready(function() { } localName = getUniqueName(localName); //IE < 10 does not fire the necessary events for the progress bar. - if($.browser.msie && parseInt($.browser.version) < 10) { + if($('html.lte9').length > 0) { } else { $('#uploadprogressbar').progressbar({value:0}); $('#uploadprogressbar').fadeIn(); @@ -557,7 +557,7 @@ $(document).ready(function() { var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName}); eventSource.listen('progress',function(progress){ //IE < 10 does not fire the necessary events for the progress bar. - if($.browser.msie && parseInt($.browser.version) < 10) { + if($('html.lte9').length > 0) { } else { $('#uploadprogressbar').progressbar('value',progress); } @@ -783,7 +783,7 @@ var dragOptions={ } } // sane browsers support using the distance option -if ( ! $.browser.msie) { +if ( $('html.ie').length === 0) { dragOptions['distance'] = 20; } -- 2.39.5