Skip to content
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

Jump to bottom

Allow to specify editors id in doc configuration #398

Merged
merged 2 commits into from Feb 3, 2015
Merged

Allow to specify editors id in doc configuration #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd3b61e
allow to specify editors id in config for new publication workflow
dontcallmedom Feb 3, 2015
6e600b1
test for editors id
dontcallmedom Feb 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions js/w3c/headers.js
View file
Open in desktop
Expand Up @@ -97,7 +97,8 @@ define(
function (hb, utils, headersTmpl, sotdTmpl, cgbgHeadersTmpl, cgbgSotdTmpl) {
Handlebars.registerHelper("showPeople", function (name, items) {
// stuff to handle RDFa
var re = "", rp = "", rm = "", rn = "", rwu = "", rpu = "", bn = "";
var re = "", rp = "", rm = "", rn = "", rwu = "", rpu = "", bn = "",
editorid = "";
if (this.doRDFa) {
if (name === "Editor") {
bn = "_:editor0";
Expand All @@ -115,15 +116,18 @@ define(
var ret = "";
for (var i = 0, n = items.length; i < n; i++) {
var p = items[i];
if (p.w3cid) {
editorid = " data-editor-id='" + parseInt(p.w3cid, 10) + "'";
}
if (this.doRDFa) {
ret += "<dd class='p-author h-card vcard' " + re + "><span" + rp + ">";
ret += "<dd class='p-author h-card vcard' " + re + editorid + "><span" + rp + ">";
if (name === "Editor") {
// Update to next sequence in rdf:List
bn = (i < n - 1) ? ("_:editor" + (i + 1)) : "rdf:nil";
re = " resource='" + bn + "'";
}
} else {
ret += "<dd class='p-author h-card vcard'>";
ret += "<dd class='p-author h-card vcard'" + editorid + ">";
}
if (p.url) {
if (this.doRDFa) {
Expand Down
2 changes: 2 additions & 0 deletions tests/spec/w3c/headers-spec.js
View file
Open in desktop
Expand Up @@ -56,6 +56,7 @@ describe("W3C — Headers", function () {
, companyURL: "http://COMPANY"
, mailto: "EMAIL"
, note: "NOTE"
, w3cid: "1234"
}] }, function ($ifr) {
expect($("dt:contains('Editors:')", $ifr[0].contentDocument).length).toEqual(0);
expect($("dt:contains('Editor:')", $ifr[0].contentDocument).length).toEqual(1);
Expand All @@ -66,6 +67,7 @@ describe("W3C — Headers", function () {
expect($dd.find("a[href='http://COMPANY']").text()).toEqual("COMPANY");
expect($dd.find("a[href='mailto:EMAIL']").length).toEqual(1);
expect($dd.find("a[href='mailto:EMAIL']").text()).toEqual("EMAIL");
expect($dd.get(0).dataset.editorId).toEqual("1234");
expect($dd.text()).toMatch(/\(NOTE\)/);
});
loadWithConfig({ specStatus: "REC", doRDFa: false, "editors[]": [{ name: "NAME1" }, { name: "NAME2" }] }, function ($ifr) {
Expand Down