CETEIcean 1.5.0 → 1.7.1

package/.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+  "cSpell.words": [
+    "Ordinality",
+    "prefixdef"
+  ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "CETEIcean",
-  "version": "1.5.0",
+  "version": "1.7.1",
   "description": "JavaScript library to load a TEI XML document and register it as HTML5 custom elements.",
   "main": "src/CETEI.js",
   "keywords": [
@@ -18,13 +18,13 @@
   "devDependencies": {
     "@babel/core": "^7.15.5",
     "@babel/preset-env": "7.15.6",
+    "@rollup/plugin-babel": "^5.3.0",
     "babel-preset-env": "^1.7.0",
-    "http-server": "^0.12.3",
+    "http-server": "^14.1.1",
     "onchange": "^6.1.1",
     "rollup": "^2.57.0",
-    "@rollup/plugin-babel": "^5.3.0",
-    "rollup-plugin-terser": "1.0.1",
-    "terser": "^3.17.0"
+    "rollup-plugin-terser": "^7.0.2",
+    "terser": "^5.14.2"
   },
   "scripts": {
     "build": "rollup -c rollup.config.js",

package/src/CETEI.js

@@ -1,6 +1,6 @@
 import defaultBehaviors from './defaultBehaviors';
 import * as utilities from './utilities';
-import {addBehaviors, addBehavior, applyBehaviors, removeBehavior} from './behaviors';
+import {addBehaviors, addBehavior, removeBehavior} from './behaviors';
 import {learnElementNames, learnCustomElementNames} from './dom';
 
 class CETEI {
@@ -10,7 +10,6 @@ class CETEI {
     // Bind methods
     this.addBehaviors = addBehaviors.bind(this);
     this.addBehavior = addBehavior.bind(this);
-    this.applyBehaviors = applyBehaviors.bind(this);
     this.removeBehavior = removeBehavior.bind(this);
 
     // Bind selected utilities
@@ -304,11 +303,14 @@ childExists(elt, name) {
   strings or an object with CSS selector keys and either functions
   or arrays as described above. Returns a closure around a function 
   that can be called in the element constructor or applied to an 
-  individual element.
+  individual element. An empty array is considered a no-op.
 
   Called by the getHandler() and getFallback() methods
 */
 decorator(template) {
+  if (Array.isArray(template) && template.length == 0) {
+    return function(e) {};
+  }
   if (Array.isArray(template) && !Array.isArray(template[0])) {
     return this.applyDecorator(template)
   } 
@@ -435,6 +437,15 @@ template(str, elt) {
   return result;
 }
 
+// Define or apply behaviors for the document
+applyBehaviors() {
+  if (window.customElements) {
+    this.define.call(this, this.els);
+  } else {
+    this.fallback.call(this, this.els);
+  }
+}
+
 /* 
   Registers the list of elements provided with the browser.
   Called by makeHTML5(), but can be called independently if, for example,
@@ -443,7 +454,7 @@ template(str, elt) {
 define(names) {
   for (let name of names) {
     try {
-      let fn = this.getHandler(this.behaviors, name);
+      const fn = this.getHandler(this.behaviors, name);
       window.customElements.define(this.tagName(name), class extends HTMLElement {
         constructor() {
           super(); 
@@ -469,7 +480,7 @@ define(names) {
       // When using the same CETEIcean instance for multiple TEI files, this error becomes very common. 
       // It's muted by default unless the debug option is set.
       if (this.debug) {
-          console.log(tagName(name) + " couldn't be registered or is already registered.");
+          console.log(this.tagName(name) + " couldn't be registered or is already registered.");
           console.log(error);
       }
     }

package/src/behaviors.js

@@ -19,6 +19,11 @@ export function addBehaviors(bhvs) {
       }
     }
   }
+  if (bhvs["functions"]) {
+    for (let fn of Object.keys(bhvs["functions"])) {
+      this.utilities[fn] = bhvs["functions"][fn];
+    }
+  }
   if (bhvs["handlers"]) {
     console.log("Behavior handlers are no longer used.")
   }
@@ -66,12 +71,3 @@ export function removeBehavior(ns, element) {
   }
   delete this.behaviors[`${p}:${element}`];
 }
-
-// Define or apply behaviors for the document
-export function applyBehaviors() {
-  if (window.customElements) {
-    this.define.call(this, this.els);
-  } else {
-    this.fallback.call(this, this.els);
-  }
-}

package/src/defaultBehaviors.js

@@ -84,11 +84,6 @@ export default {
         document.querySelector("head").appendChild(title);
       }]
     ],
-    "cell": [
-      ["[cols]", function(elt) {
-        elt.setAttribute("style", "grid-column: " + this.getOrdinality(elt) + " / span " + elt.getAttribute("cols") + ";");
-      }]
-    ]
   },
   "teieg": {
     "egXML": function(elt) {

package/src/utilities.js

@@ -208,7 +208,6 @@ export function serialize(el, stripElt, ws) {
   return str;
 }
 
-
 export function unEscapeEntities(str) {
   return str.replace(/>/, ">")
             .replace(/"/, "\"")

package/test/EEBOTest.html

@@ -75,7 +75,6 @@
       CETEIcean.getHTML5('https://raw.githubusercontent.com/textcreationpartnership/A00689/master/A00689.xml', function(data) {
         document.getElementById("TEI").innerHTML = "";
         document.getElementById("TEI").appendChild(data);
-        CETEIcean.addStyle(document, data);
         // Fix combining abbreviation marker in Chrome
         if (!!window.chrome) {
           var gs = document.getElementsByTagName("tei-g");

package/test/registerElements.html

@@ -1,31 +0,0 @@
-<html>
-  <head>
-    <meta charset="utf-8">
-    <link rel="stylesheet" href="CETEIcean.css" media="screen" charset="utf-8">
-  </head>
-  <body>
-    <div id="TEI"></div>
-    <script src="../dist/CETEI.js"></script>
-    <script>
-
-      /* Testing the functions for registering elements. All these should work */
-
-      // Repeated elements should be skipped
-      var els = ["TEI", "TEI", "teiHeader"];
-
-      var CETEIcean = new CETEI();
-
-      if (document.registerElement) {
-        CETEIcean.registerAll(els);
-        if (document.createElement("tei-TEI") instanceof HTMLElement) {
-          console.log("tei-TEI correctly registered without conflict");
-        }
-      }
-      else {
-        console.log("HTML CE not supported. Fallback used.")
-      }
-
-
-    </script>
-  </body>
-</html>