Restructured content observables

Author: squidfunk

material/assets/javascripts/bundle.7ca7dfaa.min.js renamed to material/assets/javascripts/bundle.195ba817.min.js

@@ -34,7 +34,7 @@
       {% endif %}
     {% endblock %}
     {% block styles %}
-      <link rel="stylesheet" href="{{ 'assets/stylesheets/main.c31396f4.min.css' | url }}">
+      <link rel="stylesheet" href="{{ 'assets/stylesheets/main.9f2461a2.min.css' | url }}">
       {% if config.theme.palette %}
         {% set palette = config.theme.palette %}
         <link rel="stylesheet" href="{{ 'assets/stylesheets/palette.9204c3b2.min.css' | url }}">
@@ -213,7 +213,7 @@
       </script>
     {% endblock %}
     {% block scripts %}
-      <script src="{{ 'assets/javascripts/bundle.7ca7dfaa.min.js' | url }}"></script>
+      <script src="{{ 'assets/javascripts/bundle.195ba817.min.js' | url }}"></script>
       {% for path in config["extra_javascript"] %}
         <script src="{{ path | url }}"></script>
       {% endfor %}

material/assets/javascripts/bundle.7ca7dfaa.min.js.map renamed to material/assets/javascripts/bundle.195ba817.min.js.map

@@ -25,11 +25,8 @@ import { Observable, merge } from "rxjs"
 import { getElements } from "~/browser"
 
 import { Component } from "../../_"
-import {
-  Annotation,
-  CodeBlock,
-  mountCodeBlock
-} from "../code"
+import { Annotation } from "../annotation"
+import { CodeBlock, mountCodeBlock } from "../code"
 import { Details, mountDetails } from "../details"
 import { DataTable, mountDataTable } from "../table"
 import { ContentTabs, mountContentTabs } from "../tabs"

material/assets/stylesheets/main.c31396f4.min.css renamed to material/assets/stylesheets/main.9f2461a2.min.css

@@ -45,31 +45,31 @@ import {
   watchElementOffset
 } from "~/browser"
 
-import { Component } from "../../../../_"
+import { Component } from "../../../_"
 
 /* ----------------------------------------------------------------------------
  * Types
  * ------------------------------------------------------------------------- */
 
 /**
- * Code annotation
+ * Annotation
  */
 export interface Annotation {
-  active: boolean                      /* Code annotation is visible */
-  offset: ElementOffset                /* Code annotation offset */
+  active: boolean                      /* Annotation is active */
+  offset: ElementOffset                /* Annotation offset */
 }
 
 /* ----------------------------------------------------------------------------
  * Functions
  * ------------------------------------------------------------------------- */
 
 /**
- * Watch code annotation
+ * Watch annotation
  *
- * @param el - Code annotation element
- * @param container - Containing code block element
+ * @param el - Annotation element
+ * @param container - Containing element
  *
- * @returns Code annotation observable
+ * @returns Annotation observable
  */
 export function watchAnnotation(
   el: HTMLElement, container: HTMLElement
@@ -88,7 +88,7 @@ export function watchAnnotation(
       })
     )
 
-  /* Actively watch code annotation on focus */
+  /* Actively watch annotation on focus */
   return watchElementFocus(el)
     .pipe(
       switchMap(active => offset$
@@ -101,12 +101,12 @@ export function watchAnnotation(
 }
 
 /**
- * Mount code annotation
+ * Mount annotation
  *
- * @param el - Code annotation element
- * @param container - Containing code block element
+ * @param el - Annotation element
+ * @param container - Containing element
  *
- * @returns Code annotation component observable
+ * @returns Annotation component observable
  */
 export function mountAnnotation(
   el: HTMLElement, container: HTMLElement

material/assets/stylesheets/main.9f2461a2.min.css.map

@@ -38,7 +38,7 @@ import {
 } from "~/browser"
 import { renderAnnotation } from "~/templates"
 
-import { Component } from "../../../../_"
+import { Component } from "../../../_"
 import {
   Annotation,
   mountAnnotation
@@ -60,11 +60,11 @@ interface MountOptions {
  * ------------------------------------------------------------------------- */
 
 /**
- * Find all code annotation markers in the given code block
+ * Find all annotation markers in the given code block
  *
- * @param container - Containing code block element
+ * @param container - Containing element
  *
- * @returns Code annotation markers
+ * @returns Annotation markers
  */
 function findAnnotationMarkers(container: HTMLElement): Text[] {
   const markers: Text[] = []
@@ -97,18 +97,18 @@ function swap(source: HTMLElement, target: HTMLElement): void {
  * ------------------------------------------------------------------------- */
 
 /**
- * Mount code annotation list
+ * Mount annotation list
  *
- * This function analyzes the given container code block and checks for markers
- * referring to elements in the given code annotation list. If no markers are
- * found, the list is left untouched. Otherwise, list elements are rendered as
- * code annotations inside the code block.
+ * This function analyzes the containing code block and checks for markers
+ * referring to elements in the given annotation list. If no markers are found,
+ * the list is left untouched. Otherwise, list elements are rendered as
+ * annotations inside the code block.
  *
- * @param el - Code annotation list element
- * @param container - Containing code block element
+ * @param el - Annotation list element
+ * @param container - Containing element
  * @param options - Options
  *
- * @returns Code annotation list component observable
+ * @returns Annotation component observable
  */
 export function mountAnnotationList(
   el: HTMLElement, container: HTMLElement, { print$ }: MountOptions
@@ -138,7 +138,7 @@ export function mountAnnotationList(
         .subscribe(active => {
           el.hidden = !active
 
-          /* Move annotation contents back into list */
+          /* Show annotations in code block or list (print) */
           for (const [id, annotation] of annotations) {
             const inner = getElement(".md-typeset", annotation)
             const child = getElement(`li:nth-child(${id})`, el)