diff options
| -rw-r--r-- | core/js/js.js | 9 | ||||
| -rw-r--r-- | settings/js/apps.js | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/core/js/js.js b/core/js/js.js index 00a775b8027..3eafb3d9d6d 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1633,6 +1633,15 @@ OC.Util = { }, /** + * 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 * * @return {bool} true if this is IE8, false otherwise 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; |