Skip to content

Extracted findProfileImage from findImage in setImage #119

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
merged 2 commits into from
Sep 23, 2019
Merged

Extracted findProfileImage from findImage in setImage #119

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13ba814
Extracted findProfileImage from findImage in setImage
megoth Sep 16, 2019
5696c3a
authn.findProfileImage -> widgets.findImage
megoth Sep 17, 2019
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
44 changes: 23 additions & 21 deletions src/widgets/buttons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ const dragAndDrop = require('./dragAndDrop')
const cancelIconURI = UI.icons.iconBase + 'noun_1180156.svg' // black X
const checkIconURI = UI.icons.iconBase + 'noun_1180158.svg' // green checkmark; Continue

const ns = UI.ns
const kb = UI.store

function getStatusArea (context) {
var box = context.statusArea || context.div || null
if (box) return box
Expand Down Expand Up @@ -219,30 +222,29 @@ buttons.findImageByClass = function findImageByClass (x) {
return iconDir + 'noun_10636_grey.svg' // Grey Circle - some thing
}

buttons.findImage = (thing) => {
const iconDir = UI.icons.iconBase
if (thing.sameTerm(ns.foaf('Agent')) || thing.sameTerm(ns.rdf('Resource'))) {
return iconDir + 'noun_98053.svg' // Globe
}
const image = kb.any(thing, ns.sioc('avatar')) ||
kb.any(thing, ns.foaf('img')) ||
kb.any(thing, ns.vcard('logo')) ||
kb.any(thing, ns.vcard('hasPhoto')) ||
kb.any(thing, ns.vcard('photo')) ||
kb.any(thing, ns.foaf('depiction'))
return image ? image.uri : null
}

// @@ Also add icons for *properties* like home, work, email, range, domain, comment,

buttons.setImage = function (element, x) {
buttons.setImage = function (element, profile) {
const kb = UI.store
const ns = UI.ns
const iconDir = UI.icons.iconBase
var findImage = function (x) {
if (x.sameTerm(ns.foaf('Agent')) || x.sameTerm(ns.rdf('Resource'))) {
return iconDir + 'noun_98053.svg' // Globe
}
var image = kb.any(x, ns.sioc('avatar')) ||
kb.any(x, ns.foaf('img')) ||
kb.any(x, ns.vcard('logo')) ||
kb.any(x, ns.vcard('hasPhoto')) ||
kb.any(x, ns.vcard('photo')) ||
kb.any(x, ns.foaf('depiction'))
return image ? image.uri : null
}

var uri = findImage(x)
element.setAttribute('src', uri || buttons.findImageByClass(x))
if (!uri && x.uri) {
kb.fetcher.nowOrWhenFetched(x.doc(), undefined, function (ok) {
element.setAttribute('src', findImage(x) || buttons.findImageByClass(x))
const uri = buttons.findImage(profile)
element.setAttribute('src', uri || buttons.findImageByClass(profile))
if (!uri && profile.uri) {
kb.fetcher.nowOrWhenFetched(profile.doc(), undefined, () => {
element.setAttribute('src', buttons.findImage(profile) || buttons.findImageByClass(profile))
})
}
}
Expand Down