CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 09:12:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move the complicated linkification code from iD to resolveStrings

Browse Source 
It's easier to insert the links there, and then the HTML strings are availble for anyone who wants them
This commit is contained in:
Bryan Housel
2021-04-30 11:26:24 -04:00
parent 25bf950458
commit b47952b369
2 changed files with 6 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/locales/en.min.json vendored
View File

File diff suppressed because one or more lines are too long

63
modules/ui/success.js
View File

@@ -251,62 +251,15 @@ export function uiSuccess(context) {
selection
.append('div')
.attr('class', 'community-name')
.append('a')
.attr('target', '_blank')
.attr('href', d.resolved.url)
.html(d.resolved.name);
let descriptionHTML = d.resolved.description || '';
let extendedDescriptionHTML = d.resolved.extendedDescription || '';
// Linkify urls in description, extendedDescription
// This gets a bit complicated because we:
// - string replace *back* to the tokens {url} and {signupUrl},
// - then string replace *those* tokens with the linkified versions.
// This way we avoid accidently clobbering a url fragment,
// For example if {url} = "openstreetmap.us" and {signupUrl} = "openstreetmap.us/join"
// we don't want "<a>openstreetmap.us</a>/join"
const url = d.resolved.url;
const signupUrl = d.resolved.signupUrl || '';
// do the longest one first
if (url.length > signupUrl.length) {
descriptionHTML = descriptionHTML.replace(url, '{url}');
extendedDescriptionHTML = extendedDescriptionHTML.replace(url, '{url}');
if (signupUrl) {
descriptionHTML = descriptionHTML.replace(signupUrl, '{signupUrl}');
extendedDescriptionHTML = extendedDescriptionHTML.replace(signupUrl, '{signupUrl}');
}
} else {
if (signupUrl) {
descriptionHTML = descriptionHTML.replace(signupUrl, '{signupUrl}');
extendedDescriptionHTML = extendedDescriptionHTML.replace(signupUrl, '{signupUrl}');
}
descriptionHTML = descriptionHTML.replace(url, '{url}');
extendedDescriptionHTML = extendedDescriptionHTML.replace(url, '{url}');
}
if (url) {
descriptionHTML = descriptionHTML.replace('{url}', linkify(url));
extendedDescriptionHTML = extendedDescriptionHTML.replace('{url}', linkify(url));
}
if (signupUrl) {
descriptionHTML = descriptionHTML.replace('{signupUrl}', linkify(signupUrl));
extendedDescriptionHTML = extendedDescriptionHTML.replace('{signupUrl}', linkify(signupUrl));
}
if (d.type === 'reddit') { // linkify subreddits #4997
descriptionHTML = descriptionHTML.replace(/(\/r\/\w*\/*)/i, match => linkify(d.resolved.url, match));
extendedDescriptionHTML = extendedDescriptionHTML.replace(/(\/r\/\w*\/*)/i, match => linkify(d.resolved.url, match));
}
.html(d.resolved.nameHTML);
selection
.append('div')
.attr('class', 'community-description')
.html(descriptionHTML);
.html(d.resolved.descriptionHTML);
// Create an expanding section if any of these are present..
if (extendedDescriptionHTML || (d.languageCodes && d.languageCodes.length)) {
if (d.resolved.extendedDescriptionHTML || (d.languageCodes && d.languageCodes.length)) {
selection
.append('div')
.call(uiDisclosure(context, `community-more-${d.id}`, false)
@@ -356,11 +309,11 @@ export function uiSuccess(context) {
.append('div')
.attr('class', 'community-more');
if (extendedDescriptionHTML) {
if (d.resolved.extendedDescriptionHTML) {
moreEnter
.append('div')
.attr('class', 'community-extended-description')
.html(extendedDescriptionHTML);
.html(d.resolved.extendedDescriptionHTML);
}
if (d.languageCodes && d.languageCodes.length) {
@@ -436,12 +389,6 @@ export function uiSuccess(context) {
return description;
});
}
function linkify(url, text) {
text = text || url;
return `<a target="_blank" href="${url}">${text}</a>`;
}
}