Skip to content

Fix icons on App page in FF #905

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 6 commits into from
Aug 17, 2016
Merged

Fix icons on App page in FF #905

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
960d0d1
Filter can't be named invert in FF
rullzer Aug 17, 2016
1444c1d
Introduce weird hack for Firefox
MorrisJobke Aug 17, 2016
314b400
Remove hack
rullzer Aug 17, 2016
ba4633b
Add viewBox to app icons
rullzer Aug 17, 2016
bded787
Empty tags are not allowed for image and feColorMatrix in IE11 and below
MorrisJobke Aug 17, 2016
28c192c
Fix null reference in IE
MorrisJobke Aug 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix null reference in IE
  • Loading branch information
@MorrisJobke
MorrisJobke committed Aug 17, 2016
commit 28c192c9f5a5279482eaabbcaf2d24e78379c5bd
12 changes: 6 additions & 6 deletions settings/js/apps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') ||
Expand Down