Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Use png_data for favicon of bookmarks imported from HTML #4345

Merged
merged 1 commit into from
Oct 4, 2016
Merged
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion app/importer.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,11 @@ importer.on('add-bookmarks', (e, bookmarks, topLevelFolder) => {
importer.on('add-favicons', (e, detail) => {
let faviconMap = {}
detail.forEach((entry) => {
faviconMap[entry.urls[0]] = entry.favicon_url
if (entry.favicon_url.startsWith('made-up-favicon:')) {
faviconMap[entry.urls[0]] = entry.png_data
} else {
faviconMap[entry.urls[0]] = entry.favicon_url
}
})
let sites = AppStore.getState().get('sites')
sites = sites.map((site) => {
Expand Down