Fixes regression noted in #36.

TEIC · Jun 18, 2020 · af3ee68 · af3ee68
1 parent 86f2d27
commit af3ee68
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/CETEI.js b/src/CETEI.js
@@ -191,6 +191,7 @@ class CETEI {
     }
 
     this.dom = convertEl(XML_dom.documentElement);
+    this.utilities.dom = this.dom;
 
     this.applyBehaviors();
     this.done = true;
@@ -400,8 +401,8 @@ template(str, elt) {
     let replacements;
     while (replacements = re.exec(str)) {
       if (elt.hasAttribute(replacements[2])) {
-        if (replacements[1] && utilities[replacements[1]]) {
-          result = result.replace(replacements[0], utilities[replacements[1]](elt.getAttribute(replacements[2])));
+        if (replacements[1] && this.utilities[replacements[1]]) {
+          result = result.replace(replacements[0], this.utilities[replacements[1]](elt.getAttribute(replacements[2])));
         } else {
           result = result.replace(replacements[0], elt.getAttribute(replacements[2]));
         }

diff --git a/src/defaultBehaviors.js b/src/defaultBehaviors.js
@@ -8,10 +8,10 @@ export default {
     "eg": ["<pre>","</pre>"],
     // inserts a link inside <ptr> using the @target; the link in the
     // @href is piped through the rw (rewrite) function before insertion
-    "ptr": ["<a href=\"$rw$first@target\">$@target</a>"],
+    "ptr": ["<a href=\"$rw@target\">$@target</a>"],
     // wraps the content of the <ref> in an HTML link
     "ref": [
-      ["[target]", ["<a href=\"$rw$first@target\">","</a>"]]
+      ["[target]", ["<a href=\"$rw@target\">","</a>"]]
     ],
     "graphic": function(elt) {
       let content = new Image();

diff --git a/src/utilities.js b/src/utilities.js
@@ -112,7 +112,7 @@ export function getPrefixDef(prefix) {
 */
 export function rw(url) {
   if (!url.match(/^(?:http|mailto|file|\/|#).*$/)) {
-    return this.base + url;
+    return this.base + this.utilities.first(url);
   } else {
     return url;
   }

diff --git a/test/simpleTest.html b/test/simpleTest.html
@@ -13,7 +13,6 @@
       CETEIcean.getHTML5('testTEI.xml', function(data) {
         document.getElementById("TEI").innerHTML = "";
         document.getElementById("TEI").appendChild(data);
-        CETEIcean.addStyle(document, data);
       });
 
       // Alternatively, use then()

diff --git a/test/testTEI.xml b/test/testTEI.xml
@@ -23,7 +23,7 @@
       <head>Review</head>
       <p>
         <title xml:id="foo" xml:lang="de">Die Leiden des jungen Werther</title>
-        <note place="foot">by <name>Goethe</name></note>
+        <note place="end">by <name>Goethe</name></note>
         is an <emph>exceptionally</emph>
         good example of a book full of <term rendition="#italic">Weltschmerz</term>.
         Here is some <add>added</add> text.</p>