summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-10-21 13:42:48 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-10-21 13:42:48 +0200
commitae0f20471aedbc5c9f6ab77bc5f25acc2be24641 (patch)
tree056ac6b5b655d80eac58d10a6d26afb08993668f /settings
parentab8616b2f85a8bdc0224deaa06de6e55d8ed2ec2 (diff)
parent89e3860e1ab2c5528f0f63c3192f458dc290b12e (diff)
downloadnextcloud-server-ae0f20471aedbc5c9f6ab77bc5f25acc2be24641.tar.gz
nextcloud-server-ae0f20471aedbc5c9f6ab77bc5f25acc2be24641.zip
Merge pull request #19923 from owncloud/apps-donotdisplaybrokenappiconininternetexplorer
Disable app icon preview in apps page for IE
Diffstat (limited to 'settings')
-rw-r--r--settings/js/apps.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js
index d51c642c9c9..987153b778c 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -161,8 +161,8 @@ OC.Settings.Apps = OC.Settings.Apps || {
var page = $('#app-' + app.id);
- // image loading kung-fu
- if (app.preview) {
+ // image loading kung-fu (IE doesn't properly scale SVGs, so disable app icons)
+ if (app.preview && !OC.Util.isIE()) {
var currentImage = new Image();
currentImage.src = app.preview;