diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-08-17 17:24:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-17 17:24:16 +0200 |
| commit | ec4d127e58ffae125887d13d6183a08749b9e7b8 (patch) | |
| tree | a85da3cd67b4faf80e737daa488d281e8756a604 /settings | |
| parent | 7cd4874112d396baecc9e6fb449fdb6c7943dbec (diff) | |
| parent | 28c192c9f5a5279482eaabbcaf2d24e78379c5bd (diff) | |
| download | nextcloud-server-ec4d127e58ffae125887d13d6183a08749b9e7b8.tar.gz nextcloud-server-ec4d127e58ffae125887d13d6183a08749b9e7b8.zip | |
Merge pull request #905 from nextcloud/invisible_icons
Fix icons on App page in FF
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/js/apps.js | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js index f8ad9c7918c..ac259dd7989 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -196,13 +196,13 @@ OC.Settings.Apps = OC.Settings.Apps || { if (app.preview && !OC.Util.isIE()) { var currentImage = new Image(); currentImage.src = app.preview; - } - currentImage.onload = function() { - page.find('.app-image') - .append(OC.Settings.Apps.imageUrl(app.preview, app.detailpage)) - .fadeIn(); - }; + currentImage.onload = function() { + page.find('.app-image') + .append(OC.Settings.Apps.imageUrl(app.preview, app.detailpage)) + .fadeIn(); + }; + } // set group select properly if(OC.Settings.Apps.isType(app, 'filesystem') || OC.Settings.Apps.isType(app, 'prelogin') || @@ -234,11 +234,12 @@ OC.Settings.Apps = OC.Settings.Apps || { imageUrl : function (url, appfromstore) { var img = '<svg width="72" height="72" viewBox="0 0 72 72">'; + if (appfromstore) { img += '<image x="0" y="0" width="72" height="72" preserveAspectRatio="xMinYMin meet" xlink:href="' + url + '" class="app-icon" /></svg>'; } else { - img += '<defs><filter id="invert"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" /></filter></defs>'; - img += '<image x="0" y="0" width="72" height="72" preserveAspectRatio="xMinYMin meet" filter="url(#invert)" xlink:href="' + url + '" class="app-icon" /></svg>'; + img += '<defs><filter id="invertIcon"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs>'; + img += '<image x="0" y="0" width="72" height="72" preserveAspectRatio="xMinYMin meet" filter="url(#invertIcon)" xlink:href="' + url + '" class="app-icon"></image></svg>'; } return img; }, |