fix(*): Fix selectors used in references for chnages in Encoda

stencila · Sep 5, 2019 · 854f427 · 854f427
1 parent 9864393
commit 854f427
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 23 deletions.
diff --git a/src/common/js/index.ts b/src/common/js/index.ts
@@ -5,11 +5,11 @@
 import './syntaxHighlight'
 
 export const init = (): void => {
-  const referenceListItemSel = '[itemprop="references"] > li'
-  const titleSel = '[itemprop="title"]'
+  const referenceListItemSel = '.references > li'
+  const titleSel = 'span[itemprop="headline"]'
   const datePublishedSel = '[itemprop="datePublished"]'
   const publicationIssueSel =
-    '[itemtype="https://schema.stenci.la/PublicationIssue"]'
+    '[itemtype="https://schema.org/PublicationIssue"]'
 
   document.querySelectorAll(referenceListItemSel).forEach(node => {
     const datePublished = node.querySelector(datePublishedSel) as HTMLElement

diff --git a/src/common/styles/citations.css b/src/common/styles/citations.css
@@ -65,7 +65,7 @@
       content: ')';
     }
 
-    + :--title {
+    + :--headline {
       display: none;
     }
   }
@@ -81,7 +81,7 @@
   }
 
   :--PublicationIssue {
-    :--title {
+    :--headline {
       &::after {
         content: ' ';
         white-space: pre;
@@ -119,7 +119,7 @@
 
   /* MLA Citation Styles */
   :--citation-style-MLA {
-    :--CreativeWork > :--title {
+    :--CreativeWork > :--headline {
       &:first-of-type {
         display: none;
       }
@@ -177,7 +177,7 @@
     }
 
     :--datePublished {
-      + :--title {
+      + :--headline {
         display: inline;
       }
     }
@@ -211,7 +211,7 @@
 
   /* APA Citation Styles */
   :--citation-style-APA {
-    :--CreativeWork > :--title {
+    :--CreativeWork > :--headline {
       &::after {
         content: '.';
       }
@@ -260,7 +260,7 @@
     :--PublicationIssue {
       display: inline;
 
-      :--title {
+      :--headline {
         &::after {
           content: ', ';
           font-style: normal;

diff --git a/src/common/styles/selectors.css b/src/common/styles/selectors.css
@@ -6,15 +6,20 @@
 @custom-selector :--PublicationIssue [itemtype='https://schema.stenci.la/PublicationIssue'];
 
 /* Properties */
+
+/* schema.org properties */
 @custom-selector :--abstracts [itemprop='abstracts'];
+@custom-selector :--author [itemprop='author'];
 @custom-selector :--authorDetails [itemprop='authorDetails'];
-@custom-selector :--authors [itemprop='authors'];
+@custom-selector :--citation [itemprop='citation'];
 @custom-selector :--datePublished [itemprop='datePublished'];
 @custom-selector :--familyName [itemprop='familyName'];
 @custom-selector :--givenName [itemprop='givenName'];
 @custom-selector :--headline [itemprop='headline'];
 @custom-selector :--issueNumber [itemprop='issueNumber'];
 @custom-selector :--pagination [itemprop='pagination'];
-@custom-selector :--references [itemprop='references'];
-@custom-selector :--title [itemprop='title'];
 @custom-selector :--url [itemprop='url'];
+
+/* Custom properties / names */
+@custom-selector :--authors .authors;
+@custom-selector :--references .references;
diff --git a/src/themes/eLife/styles.css b/src/themes/eLife/styles.css
@@ -322,7 +322,7 @@ blockquote {
   }
 
   :--CreativeWork {
-    > :--title:first-of-type {
+    > :--headline:first-of-type {
       display: block;
       font-size: 1rem;
       line-height: 1.5;
@@ -336,7 +336,7 @@ blockquote {
     font-family: var(--body-font);
   }
 
-  :--title + :--datePublished {
+  :--headline + :--datePublished {
     display: none;
   }
 }
diff --git a/src/themes/nature/styles.css b/src/themes/nature/styles.css
@@ -485,7 +485,7 @@ blockquote {
   }
 
   /* MLA Citation Styles */
-  :--CreativeWork > :--title {
+  :--CreativeWork > :--headline {
     &:first-of-type {
       display: none;
     }
@@ -544,7 +544,7 @@ blockquote {
   }
 
   :--datePublished {
-    + :--title {
+    + :--headline {
       display: inline;
     }
 

diff --git a/src/themes/plos/index.ts b/src/themes/plos/index.ts
@@ -4,7 +4,7 @@ export const init = (): void => {
   const referenceListItemSel = '[itemprop="references"] > li'
   const datePublishedSel = '[itemprop="datePublished"]'
   const publicationIssueTitleSel =
-    '[itemtype="https://schema.stenci.la/PublicationIssue"] [itemprop="title"]'
+    '[itemtype="https://schema.org/PublicationIssue"] [itemprop="title"]'
 
   document.querySelectorAll(referenceListItemSel).forEach(node => {
     // If PublicationIssue title node exists,

diff --git a/src/themes/plos/styles.css b/src/themes/plos/styles.css
@@ -301,7 +301,7 @@ blockquote {
     }
   }
 
-  :--CreativeWork > :--title {
+  :--CreativeWork > :--headline {
     &:first-of-type {
       display: none;
     }
@@ -311,7 +311,7 @@ blockquote {
     display: none;
   }
 
-  :--datePublished + :--title {
+  :--datePublished + :--headline {
     display: inline;
 
     &::after {
@@ -321,14 +321,14 @@ blockquote {
   }
 
   :--PublicationIssue {
-    :--title {
+    :--headline {
       &::after {
         content: '. ';
         white-space: pre;
       }
     }
 
-    :--title + :--datePublished {
+    :--headline + :--datePublished {
       &:not(:last-child)::after {
         content: ';';
         white-space: pre;

diff --git a/src/themes/stencila/styles.css b/src/themes/stencila/styles.css
@@ -394,7 +394,7 @@ blockquote {
   :--CreativeWork {
     margin-bottom: 1rem;
 
-    > :--title:first-of-type {
+    > :--headline:first-of-type {
       display: block;
       font-size: 1rem;
       line-height: 1.5;
@@ -403,7 +403,7 @@ blockquote {
     }
   }
 
-  :--title + :--datePublished {
+  :--headline + :--datePublished {
     display: none;
   }
 }