mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #19923 from owncloud/apps-donotdisplaybrokenappiconininternetexplorer 

Disable app icon preview in apps page for IE
This commit is contained in:
Thomas Müller 2015-10-21 13:42:48 +02:00
parent ab8616b2f8 89e3860e1a
commit ae0f20471a
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/js/js.js
View File

@ -1632,6 +1632,15 @@ OC.Util = {
return $el; 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 * Returns whether this is IE8
* *

4
settings/js/apps.js
View File

@ -161,8 +161,8 @@ OC.Settings.Apps = OC.Settings.Apps || {
var page = $('#app-' + app.id); var page = $('#app-' + app.id);
// image loading kung-fu // image loading kung-fu (IE doesn't properly scale SVGs, so disable app icons)
if (app.preview) { if (app.preview && !OC.Util.isIE()) {
var currentImage = new Image(); var currentImage = new Image();
currentImage.src = app.preview; currentImage.src = app.preview;