summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-10-21 10:50:06 +0200
committerVincent Petry <pvince81@owncloud.com>2015-10-21 10:50:06 +0200
commit89e3860e1ab2c5528f0f63c3192f458dc290b12e (patch)
treeb24383492c15fe41fcf36f0184a24504833a6007
parent645d27a84931e936048a391943914f58a2bebb75 (diff)
downloadnextcloud-server-89e3860e1ab2c5528f0f63c3192f458dc290b12e.tar.gz
nextcloud-server-89e3860e1ab2c5528f0f63c3192f458dc290b12e.zip
Disable app icon preview in apps page for IE
All IE versions are not able to properly upscale SVG icons unless the said SVG files contain a "viewBox" attribute, which is not always the case. Also we cannot guarantee that all third party apps will have this attribute in their icons. So for now, app icons will not be displayed in IE instead of broken ones.
-rw-r--r--core/js/js.js9
-rw-r--r--settings/js/apps.js4
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;