2.2.17

examples/article.html

@@ -42,7 +42,7 @@
 </d-front-matter>
 <d-title>
   <figure style="grid-column: page; margin: 1rem 0;"><img src="momentum.png" style="width:100%; border: 1px solid rgba(0, 0, 0, 0.2);"/></figure>
-  <p>We often think of Momentum as a means of dampening oscillations and speeding up the iterations, leading to faster convergence. But it has other interesting behavior. It allows a larger range of step-sizes to be used, and creates its own oscillations. What is going on?</p>
+  <p>We often think of Momentum<d-cite key="mercier2011humans"></d-cite> as a means of dampening oscillations and speeding up the iterations, leading to faster convergence. But it has other interesting behavior. It allows a larger range of step-sizes to be used, and creates its own oscillations. What is going on?</p>
 </d-title>
 <d-article>
   <a class="marker" href="#section-1" id="section-1"><span>1</span></a>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "distill-template",
-  "version": "2.2.7",
+  "version": "2.2.17",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "distill-template",
-  "version": "2.2.7",
+  "version": "2.2.17",
   "description": "Template for creating Distill articles.",
   "main": "dist/template.v2.js",
   "bin": {
@@ -12,7 +12,7 @@
     "url": "https://github.com/distillpub/distill-template/issues"
   },
   "scripts": {
-    "start": "rollup -c rollup.config.dev.js -w",
+    "dev": "rollup -c rollup.config.dev.js -w",
     "serve": "python3 -m http.server --bind 127.0.0.1 8888",
     "test": "mocha",
     "lint": "eslint",

src/components.js

@@ -2,7 +2,7 @@ import { Controller } from './controller';
 
 /* Transforms */
 import { makeStyleTag }    from './styles/styles';
-import { Polyfills, polyfills }       from './helpers/polyfills';
+import { Polyfills }       from './helpers/polyfills';
 
 /* Components */
 import { Abstract }        from './components/d-abstract';
@@ -48,10 +48,22 @@ const distillMain = function() {
   makeStyleTag(document);
   console.info('Runlevel 1: Static Distill styles have been added.');
   console.info('Runlevel 1->2.');
-  window.distillRunlevel = 2;
+  window.distillRunlevel += 1;
 
-  /* 3. Register components */
-  /* Article will register controller which takes control from there */
+  /* 3. Register Controller listener functions */
+  /* Needs to happen before components to their connected callbacks have a controller to talk to. */
+  for (const [functionName, callback] of Object.entries(Controller.listeners)) {
+    if (typeof callback === 'function') {
+      document.addEventListener(functionName, callback);
+    } else {
+      console.error('Runlevel 2: Controller listeners need to be functions!');
+    }
+  }
+  console.info('Runlevel 2: We can now listen to controller events.');
+  console.info('Runlevel 2->3.');
+  window.distillRunlevel += 1;
+
+  /* 4. Register components */
   const components = [
     Abstract, Appendix, Article, Bibliography, Byline, Cite, CitationList, Code,
     Footnote, FootnoteList, FrontMatter, HoverBox, Title, DMath, References, TOC, Figure,
@@ -71,12 +83,15 @@ const distillMain = function() {
     customElements.define(component.is, component);
   }
 
-  console.info('Runlevel 2: Distill Template finished registering custom elements.');
-  console.info('Runlevel 2->3.');
-  window.distillRunlevel = 3;
-  console.info('Distill Template initialisation complete.');
+  console.info('Runlevel 3: Distill Template finished registering custom elements.');
+  console.info('Runlevel 3->4.');
+  window.distillRunlevel += 1;
+
+  // If template was added after DOMContentLoaded we may have missed that event.
+  // Controller will check for that case, so trigger the event explicitly:
   Controller.listeners.DOMContentLoaded();
 
+  console.info('Runlevel 4: Distill Template initialisation complete.');
 };
 
 window.distillRunlevel = 0;
@@ -84,7 +99,7 @@ window.distillRunlevel = 0;
 if (Polyfills.browserSupportsAllFeatures()) {
   console.info('Runlevel 0: No need for polyfills.');
   console.info('Runlevel 0->1.');
-  window.distillRunlevel = 1;
+  window.distillRunlevel += 1;
   distillMain();
 } else {
   console.info('Runlevel 0: Distill Template is loading polyfills.');

src/components/d-appendix.js

@@ -1,11 +1,10 @@
 import { Template } from '../mixins/template';
-import { body } from '../helpers/layout';
 
 const T = Template('d-appendix', `
 <style>
 
 d-appendix {
-  contain: content;
+  contain: layout style;
   font-size: 0.8em;
   line-height: 1.7em;
   margin-top: 60px;

src/components/d-article.js

@@ -1,5 +1,5 @@
 // import { Template } from '../mixins/template';
-import { Controller } from '../controller';
+// import { Controller } from '../controller';
 
 const isOnlyWhitespace = /^\s*$/;
 
@@ -29,20 +29,4 @@ export class Article extends HTMLElement {
     }).observe(this, {childList: true});
   }
 
-  connectedCallback() {
-    document.onreadystatechange = function () {
-      console.log('onreadystatechange:');
-      console.log(document.readyState);
-    };
-    console.info('Article tag connected, we can now listen to controller events.');
-    console.info('Runlevel 3->4.');
-    for (const [functionName, callback] of Object.entries(Controller.listeners)) {
-      if (typeof callback === 'function') {
-        document.addEventListener(functionName, callback);
-      } else {
-        console.error('Controller listeners need to be functions!');
-      }
-    }
-  }
-
 }

src/components/d-citation-list.js

@@ -2,8 +2,7 @@ import { bibliography_cite } from '../helpers/citation';
 
 const styles = `
 d-citation-list {
-  contain: content;
-  overflow: hidden;
+  contain: layout style;
 }
 
 d-citation-list .references {

src/components/d-cite.js

@@ -38,6 +38,21 @@ d-hover-box {
   margin-top: 1.9em;
 }
 
+ul {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
+
+ul li {
+  padding: 15px 10px 15px 10px;
+  border-bottom: 1px solid rgba(0,0,0,0.1)
+}
+
+ul li:last-of-type {
+  border-bottom: none;
+}
+
 </style>
 
 <d-hover-box id="hover-box"></d-hover-box>
@@ -106,7 +121,9 @@ export class Cite extends T(HTMLElement) {
 
   set entries(entries) {
     if (this.hoverBox) {
-      this.hoverBox.innerHTML = entries.map(hover_cite).join('<br><br>');
+      this.hoverBox.innerHTML = `<ul>
+      ${entries.map(hover_cite).map(html => `<li>${html}</li>`).join('\n')}
+      </ul>`;
     }
   }
 

src/components/d-footnote-list.js

@@ -4,8 +4,7 @@ const T = Template('d-footnote-list', `
 <style>
 
 d-footnote-list {
-  contain: content;
-  overflow: hidden;
+  contain: layout style;
 }
 
 d-footnote-list > * {

src/components/d-hover-box.js

@@ -20,6 +20,8 @@ const T = Template('d-hover-box', `
 
 .panel {
   position: absolute;
+  font-size: 1rem;
+  line-height: 1.5em;
   top: 0;
   left: 0;
   width: 100%;
@@ -27,11 +29,9 @@ const T = Template('d-hover-box', `
   background-color: rgb(250, 250, 250);
   box-shadow: 0 0 7px rgba(0, 0, 0, 0.1);
   border-radius: 4px;
-  padding: 10px;
   box-sizing: border-box;
 }
 
-
 </style>
 
 <div class="container">
@@ -52,7 +52,7 @@ export class HoverBox extends T(HTMLElement) {
   }
 
   listen(element) {
-    console.log(element)
+    // console.log(element)
     this.bindDivEvents(this);
     this.bindTriggerEvents(element);
     // this.style.display = "block";

src/components/d-toc.js

@@ -20,7 +20,7 @@ export function renderTOC(element, headings) {
   <style>
 
   d-toc {
-    contain: content;
+    contain: layout style;
     display: block;
   }
 

src/controller.js

@@ -6,6 +6,10 @@ import optionalComponents from './transforms/optional-components';
 
 const frontMatter = new FrontMatter();
 
+function domContentLoaded() {
+  return ['interactive', 'complete'].indexOf(document.readyState) !== -1;
+}
+
 export const Controller = {
 
   frontMatter: frontMatter,
@@ -120,7 +124,7 @@ export const Controller = {
       }
 
       const prerendered = document.body.hasAttribute('distill-prerendered');
-      if (!prerendered) {
+      if (!prerendered && domContentLoaded()) {
         optionalComponents(document, frontMatter);
 
         const appendix = document.querySelector('distill-appendix');
@@ -141,18 +145,22 @@ export const Controller = {
     },
 
     DOMContentLoaded() {
-      if (Controller.loaded || ['interactive', 'complete'].indexOf(document.readyState) === -1) {
+      if (Controller.loaded) {
+        console.warn('Controller received DOMContentLoaded but was already loaded!');
+        return;
+      } else if (!domContentLoaded()) {
+        console.warn('Controller received DOMContentLoaded before appropriate document.readyState!');
         return;
       } else {
         Controller.loaded = true;
-        console.log('Controller running DOMContentLoaded');
+        console.log('Runlevel 4: Controller running DOMContentLoaded');
       }
 
       const frontMatterTag = document.querySelector('d-front-matter');
       const data = parseFrontmatter(frontMatterTag);
       Controller.listeners.onFrontMatterChanged({detail: data});
 
-      // console.debug('Resolving "citations" dependency due to initial DOM load.');
+      // Resolving "citations" dependency due to initial DOM load
       frontMatter.citations = collect_citations();
       frontMatter.citationsCollected = true;
       for (const waitingCallback of Controller.waitingOn.citations.slice()) {

src/distill-components/distill-appendix.js

@@ -3,8 +3,7 @@ import { serializeFrontmatterToBibtex } from '../helpers/bibtex';
 const styles = `
 <style>
   distill-appendix {
-    contain: content;
-    overflow: hidden;
+    contain: layout style;
   }
 
   distill-appendix .citation {

src/distill-components/distill-header.js

@@ -72,18 +72,14 @@ distill-header .nav a {
     ${logo}
     Distill
   </a>
-  <div class="nav">
+  <nav class="nav">
     <a href="/about/">About</a>
     <a href="/prize/">Prize</a>
     <a href="/journal/">Submit</a>
-  </div>
+  </nav>
 </div>
 `, false);
 
-// <div class="nav">
-//   <a href="https://github.com/distillpub">GitHub</a>
-//   <!-- https://twitter.com/distillpub -->
-// </div>
 
 export class DistillHeader extends T(HTMLElement) {
 

src/helpers/citation.js

@@ -114,13 +114,22 @@ function doi_string(ent, new_line){
   }
 }
 
+function title_string(ent) {
+  return '<span class="title">' + ent.title + '</span> ';
+}
+
 export function bibliography_cite(ent, fancy){
   if (ent){
-    var cite =  '<span class="title">' + ent.title + '</span> ';
+    var cite = title_string(ent);
     cite += link_string(ent) + '<br>';
-    cite += author_string(ent, '${L}, ${I}', ', ', ' and ');
-    if (ent.year || ent.date){
-      cite += ', ' + (ent.year || ent.date) + '. ';
+    if (ent.author) {
+      cite += author_string(ent, '${L}, ${I}', ', ', ' and ');
+      if (ent.year || ent.date) {
+        cite += ', ';
+      }
+    }
+    if (ent.year || ent.date) {
+      cite += (ent.year || ent.date) + '. ';
     } else {
       cite += '. ';
     }
@@ -146,7 +155,7 @@ export function bibliography_cite(ent, fancy){
 export function hover_cite(ent){
   if (ent){
     var cite = '';
-    cite += '<b>' + ent.title + '</b>';
+    cite += '<strong>' + ent.title + '</strong>';
     cite += link_string(ent);
     cite += '<br>';
 

src/styles/d-article.css

@@ -1,9 +1,9 @@
 d-article {
-  contain: content;
+  contain: layout style;
+  overflow-x: hidden;
   border-top: 1px solid rgba(0, 0, 0, 0.1);
   padding-top: 2rem;
   color: rgba(0, 0, 0, 0.8);
-  overflow: hidden;
 }
 
 d-article > * {
@@ -169,14 +169,29 @@ d-article span.equation-mimic {
 d-article > d-code,
 d-article section > d-code  {
   display: block;
-  overflow-x: scroll;
-
 }
 
 d-article > d-math[block],
 d-article section > d-math[block]  {
   display: block;
-  overflow-x: scroll;
+}
+
+@media (max-width: 768px) {
+  d-article > d-code,
+  d-article section > d-code,
+  d-article > d-math[block],
+  d-article section > d-math[block] {
+      overflow-x: scroll;
+      -ms-overflow-style: none;  // IE 10+
+      overflow: -moz-scrollbars-none;  // Firefox
+  }
+
+  d-article > d-code::-webkit-scrollbar,
+  d-article section > d-code::-webkit-scrollbar,
+  d-article > d-math[block]::-webkit-scrollbar,
+  d-article section > d-math[block]::-webkit-scrollbar {
+    display: none;  // Safari and Chrome
+  }
 }
 
 d-article .citation {
@@ -190,8 +205,7 @@ d-include {
 }
 
 d-figure {
-  contain: content;
-  overflow: hidden;
+  contain: layout style;
 }
 
 /* KaTeX */

src/styles/d-byline.css

@@ -1,6 +1,7 @@
 d-byline {
-  border-top: 1px solid rgba(0, 0, 0, 0.1);
   contain: content;
+  overflow: hidden;
+  border-top: 1px solid rgba(0, 0, 0, 0.1);
   font-size: 0.8rem;
   line-height: 1.8em;
   padding: 1.5rem 0;

src/styles/d-title.css

@@ -1,7 +1,7 @@
 d-title {
   padding: 2rem 0 1.5rem;
-  contain: content;
-  overflow: hidden;
+  contain: layout style;
+  overflow-x: hidden;
 }
 
 @media(min-width: 768px) {
@@ -14,29 +14,23 @@ d-title h1 {
   grid-column: text;
   font-size: 40px;
   font-weight: 700;
-  line-height: 1.05em;
-  margin: 0 0 1rem;
+  line-height: 1.1em;
+  margin: 0 0 0.5rem;
 }
 
 @media(min-width: 768px) {
   d-title h1 {
-    font-size: 60px;
+    font-size: 50px;
   }
 }
 
 d-title p {
   font-weight: 300;
   font-size: 1.2rem;
-  line-height: 1.7em;
+  line-height: 1.55em;
   grid-column: text;
 }
 
-@media(min-width: 768px) {
-  d-title p {
-    font-size: 1.5rem;
-  }
-}
-
 d-title .status {
   margin-top: 0px;
   font-size: 12px;
@@ -52,4 +46,4 @@ d-title .status span {
   border-bottom: 1px solid #80cbc4;
   font-size: 11px;
   text-transform: uppercase;
-}
+}

src/styles/styles-base.css

@@ -90,7 +90,7 @@ sub {
 figure {
   position: relative;
   margin-bottom: 2.5em;
-  margin-top: 2.5em;
+  margin-top: 1.5em;
 }
 
 figcaption+figure {
@@ -131,7 +131,8 @@ figcaption a {
   color: rgba(0, 0, 0, 0.6);
 }
 
-figcaption b {
+figcaption b,
+figcaption strong, {
   font-weight: 600;
   color: rgba(0, 0, 0, 1.0);
 }

src/ui/d-slider.js

@@ -181,6 +181,7 @@ export class Slider extends T(HTMLElement) {
   static get observedAttributes() {return ['min', 'max', 'value', 'step', 'ticks', 'origin', 'tickValues', 'tickLabels']; }
 
   attributeChangedCallback(attr, oldValue, newValue) {
+    if (isNaN(newValue) || newValue === undefined || newValue === null) return;
     if (attr == 'min') {
       this.min = +newValue;
       this.setAttribute('aria-valuemin', this.min);
@@ -194,7 +195,7 @@ export class Slider extends T(HTMLElement) {
     }
     if (attr == 'origin') {
       this.origin = +newValue;
-      this.update(this.value);
+      // this.update(this.value);
     }
     if (attr == 'step') {
       if (newValue > 0) {