]> source.dussan.org Git - nextcloud-server.git/commitdiff
use css browser switch instead of deprecated jquery browser detection
authorJörn Friedrich Dreyer <jfd@butonic.de>
Thu, 28 Mar 2013 18:13:37 +0000 (19:13 +0100)
committerJörn Friedrich Dreyer <jfd@butonic.de>
Thu, 28 Mar 2013 18:13:37 +0000 (19:13 +0100)
apps/files/js/files.js

index 5060fe93f1d7aef33e574e1fc266572f2514afdb..6ae113a062ce270af7985ad219bdc6fc8da3f7d1 100644 (file)
@@ -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;
 }