fixes #102 unnecessary directory redirect

gibatronic · Oct 16, 2021 · 0568104 · 0568104
1 parent f99ccb2
commit 0568104
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/client/scripts/asset-link.js b/client/scripts/asset-link.js
@@ -9,19 +9,23 @@ export default class AssetLink extends CustomElement(HTMLAnchorElement) {
     highlight(highlightedGraphemes) {
         const regExp = new RegExp(`^(${highlightedGraphemes})`, 'iu')
 
-        this.highlighted = highlightedGraphemes !== '' && regExp.test(this.url)
+        this.highlighted = highlightedGraphemes !== '' && regExp.test(this.name)
 
         if (this.highlighted) {
             const template = '<mark class="asset-mark">$1</mark>'
 
-            this.innerHTML = this.url.replace(regExp, template)
+            this.innerHTML = this.name.replace(regExp, template)
         } else {
-            this.textContent = this.url
+            this.textContent = this.name
         }
 
         this.classList.toggle('asset-link--highlighted', this.highlighted)
     }
 
+    get name() {
+        return this.dataset.name
+    }
+
     get type() {
         if (this.classList.contains('asset-link--directory')) {
             return 'directory'
@@ -33,8 +37,4 @@ export default class AssetLink extends CustomElement(HTMLAnchorElement) {
 
         return ''
     }
-
-    get url() {
-        return this.getAttribute('href')
-    }
 }
diff --git a/client/templates/main.xslt b/client/templates/main.xslt
@@ -60,23 +60,30 @@
                         <li is="asset-item">
                             <xsl:attribute name="class">
                                 <xsl:text>asset-item asset-item--</xsl:text>
-                                <xsl:value-of select="name(.)" />
+                                <xsl:value-of select="name()" />
                             </xsl:attribute>
 
                             <a is="asset-link">
                                 <xsl:attribute name="aria-label">
-                                    <xsl:value-of select="name(.)" />
+                                    <xsl:value-of select="name()" />
                                     <xsl:text> </xsl:text>
                                     <xsl:value-of select="." />
                                 </xsl:attribute>
 
+                                <xsl:attribute name="data-name">
+                                    <xsl:value-of select="." />
+                                </xsl:attribute>
+
                                 <xsl:attribute name="href">
                                     <xsl:value-of select="." />
+                                    <xsl:if test="name() = 'directory'">
+                                        <xsl:text>/</xsl:text>
+                                    </xsl:if>
                                 </xsl:attribute>
 
                                 <xsl:attribute name="class">
                                     <xsl:text>asset-link asset-link--</xsl:text>
-                                    <xsl:value-of select="name(.)" />
+                                    <xsl:value-of select="name()" />
                                 </xsl:attribute>
 
                                 <xsl:value-of select="." />