diff --git a/core/js/js.js b/core/js/js.js index 00a775b8027f86eb8221ac7d11aee8904f91f8ee..3eafb3d9d6dc5c826b3f6d75343e17ffabc2aac0 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1632,6 +1632,15 @@ OC.Util = { return $el; }, + /** + * Returns whether this is IE + * + * @return {bool} true if this is IE, false otherwise + */ + isIE: function() { + return $('html').hasClass('ie'); + }, + /** * Returns whether this is IE8 * diff --git a/settings/js/apps.js b/settings/js/apps.js index d51c642c9c9ee0b28d91b8b5479f98a53f4bce07..987153b778c5f8092b0a1ddbe6a01d2836eab457 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;