summaryrefslogtreecommitdiffstats
path: root/apps/files/js/files.js
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2013-03-28 19:13:37 +0100
committerJörn Friedrich Dreyer <jfd@butonic.de>2013-03-28 19:13:37 +0100
commit7ecbaef16c378a7fa972d9e9f3f81491552d8a4e (patch)
tree7a727fa67a2bb8c0e48893c21d4aae5426b1bafd /apps/files/js/files.js
parentdac875eb9c99365367f8f1f15da40c7228c466ab (diff)
downloadnextcloud-server-7ecbaef16c378a7fa972d9e9f3f81491552d8a4e.tar.gz
nextcloud-server-7ecbaef16c378a7fa972d9e9f3f81491552d8a4e.zip
use css browser switch instead of deprecated jquery browser detection
Diffstat (limited to 'apps/files/js/files.js')
-rw-r--r--apps/files/js/files.js14
1 files 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;
}