aboutsummaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-11-10 17:48:10 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-11-10 17:48:10 +0100
commitb1731245ee8bca2db9f2786e9e79b497339a460b (patch)
tree4067a65dc009454b292c62d46c6e26e33a29dae8 /core/js
parent0c46f75f6aaa10cd36088bec23537f648fd45cc6 (diff)
parenta2cd9708f66b05a0825e9b8bc6c65a21d1a2b5a0 (diff)
downloadnextcloud-server-b1731245ee8bca2db9f2786e9e79b497339a460b.tar.gz
nextcloud-server-b1731245ee8bca2db9f2786e9e79b497339a460b.zip
Merge pull request #20434 from owncloud/set-ie-class-for-ie10plus
Set "ie" CSS class for IE10, IE11
Diffstat (limited to 'core/js')
-rw-r--r--core/js/js.js8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/js/js.js b/core/js/js.js
index 460f65256a9..07320a1d225 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1236,6 +1236,14 @@ function initCore() {
*/
moment.locale(OC.getLocale());
+ if ($.browser.msie || !!navigator.userAgent.match(/Trident\/7\./)) {
+ // for IE10+ that don't have conditional comments
+ // and IE11 doesn't identify as MSIE any more...
+ $('html').addClass('ie');
+ } else if (!!navigator.userAgent.match(/Edge\/12/)) {
+ // for edge
+ $('html').addClass('edge');
+ }
/**
* Calls the server periodically to ensure that session doesn't