Skip to content

Finished code formatting #2

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

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Finished code formatting #2

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d30a149
remove comma after state
macbookandrew Aug 30, 2014
cc9b903
remove trailing line break from city to fix code spacing issues
macbookandrew Aug 30, 2014
ac66b8e
add tel link
macbookandrew Aug 30, 2014
4b22dd8
remove ad
macbookandrew Aug 30, 2014
be8984d
add job title field
macbookandrew Aug 30, 2014
4c4c820
declare `fn` before it's needed
macbookandrew Sep 15, 2014
60a6bf1
add note about a bug related to the title field
macbookandrew Sep 15, 2014
b639192
add note about a.tel links
macbookandrew Sep 16, 2014
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
24 changes: 17 additions & 7 deletions creators/hcard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@

function codeit() {
/* get values of text fields */
var title = NormalizeSpace($('#title').val());
var givenname = NormalizeSpace($('#givenname').val());
var additionalname = NormalizeSpace($('#additionalname').val());
var familyname = NormalizeSpace($('#familyname').val());
Expand All @@ -95,6 +96,7 @@

var templates = {
vcard: '<div id="${id}" class="vcard">${content}</div>',
title: ' <span class="title">${title}</span>',
given_name : ' <span class="given-name">${given_name}</span>',
additional_name : ' <span class="additional-name">${additional_name}</span>',
family_name : ' <span class="family-name">${family_name}</span>',
Expand All @@ -107,20 +109,23 @@
region : ' <span class="region">${region}<\/span>',
postal_code : ' <span class="postal-code">${postal_code}</span>',
country_name : ' <span class="country-name">${country}<\/span>',
tel : ' <div class="tel">${tel}</div>',
tel : ' <div class="tel"><a class="tel" href="tel:+1${tel}">${tel}</a></div>',
/* TODO: add encodeURIComponent to templates */
aim : ' <a class="url" href="aim:goim?screenname=${aim}">AIM<\/a>\n',
yim : ' <a class="url" href="ymsgr:sendIM?${yim}">YIM<\/a>\n',
jabber : ' <a class="url" href="xmpp:${jabber}">Jabber</a>\n',
tags : '<div>${tags}</div>',
tag : '<span class="category">${term}</span>',
ad : '<p style="font-size:smaller;">This <a href="http://microformats.org/wiki/hcard">hCard</a> created with the <a href="http://microformats.org/code/hcard/creator">hCard creator</a>.</p>'
};

var implied_n_opt = ((additionalname == undefined || additionalname == "") && (givenname && givenname.indexOf(' ') == -1) && (familyname && familyname.indexOf(' ') == -1));
var fn;
if(implied_n_opt) {
var fn = filter(null, [givenname, familyname]).join(' ');
fn = filter(null, [givenname, familyname]).join(' ');
} else {
if (title != "") {
fn += templates.title.process({title : title}) + "\n";
}
var fn = templates.given_name.process({given_name : givenname}) + "\n";
var fn_text = givenname;
if (additionalname != "") {
Expand All @@ -129,7 +134,8 @@
fn += templates.family_name.process({family_name : familyname}) + "\n";
}
/* set results field */
var fn_id = (filter(null, [givenname, additionalname, familyname]).length > 0 ? filter(null, ['hcard', givenname, additionalname, familyname]).join(' ').replace(/ /g, '-'): '');
// FIXME: fix title not being displayed in output
var fn_id = (filter(null, [title, givenname, additionalname, familyname]).length > 0 ? filter(null, ['hcard', title, givenname, additionalname, familyname]).join(' ').replace(/ /g, '-'): '');
var resultstr = '<div id="' + fn_id + '" class="vcard">\n';
if(photo && photo.match(/https?:\/\/.*\..{2,4}.*\/.+/)) resultstr += templates.photo.process({photo_url:photo, fn:fn_text}) + "\n";
if(url && url.match(/https?\:\/\/.*\..{2,4}.*/)) { // make sure the url at least looks like a url before we load it
Expand All @@ -148,13 +154,13 @@
resultstr += ' <div class="adr">\n';
if(street) resultstr += templates.street_address.process({street_address : street}) + "\n";
var csz = "";
if(city) csz += templates.city.process({city: city}) + "\n";
if(city) csz += templates.city.process({city: city});
if(region) {
if(csz) csz += ', \n';
csz += templates.region.process({region : region}) + "\n";
}
if(postal) {
if(csz) csz += ', \n';
if(csz) csz += '\n';
csz += templates.postal_code.process({postal_code : postal}) + "\n";
}
if(country) {
Expand All @@ -165,6 +171,7 @@
resultstr += csz + ' <\/div>\n';
}
if(phone) resultstr += templates.tel.process({tel: phone}) + "\n";
// TODO: remove hyphens from a.tel link
if(aim) resultstr += templates.aim.process({ aim : aim}) + "\n";
if(yim) resultstr += templates.yim.process({yim : yim}) + "\n";
if(jabber) resultstr += templates.jabber.process({jabber : jabber}) + "\n";
Expand All @@ -177,7 +184,6 @@
}
resultstr += templates.tags.process({tags : temp})
}
resultstr += templates.ad.process({}) + "\n";
resultstr += '<\/div>';
$(outputfield).val(resultstr);
$("#preview").html(resultstr);
Expand Down Expand Up @@ -210,6 +216,10 @@ <h1><a href="http://microformats.org/wiki/hcard">hCard</a> Creator</h1>
<form action="" onreset="doreset();">
<fieldset><legend><a href="http://microformats.org/wiki/hcard">hCard</a>-o-matic</legend>

<div class="field">
<label for="title">title</label>
<input type="text" id="title" />
</div>
<div class="field">
<label for="givenname">given name</label>
<input type="text" id="givenname" />
Expand Down