« get me outta code hell

content, test: image: remove 'id' slot - hsmusic-wiki - HSMusic - static wiki software cataloguing collaborative creation
about summary refs log tree commit diff
diff options
context:
space:
mode:
author(quasar) nebula <qznebula@protonmail.com>2024-01-13 16:00:03 -0400
committer(quasar) nebula <qznebula@protonmail.com>2024-01-13 16:00:03 -0400
commit58692c5544781c0fb50f7ab112be7eb38a188ae6 (patch)
tree872b93f91c1d8671caedde58d865d1b4913aaa92
parent944ea96ae6f72c11527091a718b124d7e396cf34 (diff)
content, test: image: remove 'id' slot
-rw-r--r--src/content/dependencies/generateCoverArtwork.js1
-rw-r--r--src/content/dependencies/image.js9
-rw-r--r--src/static/site6.css2
-rw-r--r--tap-snapshots/test/snapshot/generateAlbumCoverArtwork.js.test.cjs2
-rw-r--r--tap-snapshots/test/snapshot/generateCoverArtwork.js.test.cjs2
-rw-r--r--tap-snapshots/test/snapshot/generateTrackCoverArtwork.js.test.cjs4
-rw-r--r--tap-snapshots/test/snapshot/image.js.test.cjs12
-rw-r--r--test/snapshot/image.js23
8 files changed, 5 insertions, 50 deletions
diff --git a/src/content/dependencies/generateCoverArtwork.js b/src/content/dependencies/generateCoverArtwork.js
index a992f5da..e333b190 100644
--- a/src/content/dependencies/generateCoverArtwork.js
+++ b/src/content/dependencies/generateCoverArtwork.js
@@ -50,7 +50,6 @@ export default {
             alt: slots.alt,
             color: slots.color,
             thumb: 'medium',
-            id: 'cover-art',
             reveal: true,
             link: true,
             square: true,
diff --git a/src/content/dependencies/image.js b/src/content/dependencies/image.js
index 4dc1100c..3121aca3 100644
--- a/src/content/dependencies/image.js
+++ b/src/content/dependencies/image.js
@@ -59,7 +59,6 @@ export default {
     lazy: {type: 'boolean', default: false},
     square: {type: 'boolean', default: false},
 
-    id: {type: 'string'},
     class: {type: 'string'},
     alt: {type: 'string'},
     width: {type: 'number'},
@@ -144,14 +143,6 @@ export default {
 
     const containerAttributes = html.attributes();
 
-    if (slots.id) {
-      if (willLink) {
-        linkAttributes.set('id', slots.id);
-      } else {
-        imgAttributes.set('id', slots.id);
-      }
-    }
-
     if (slots.class) {
       if (willLink) {
         linkAttributes.set('class', slots.class);
diff --git a/src/static/site6.css b/src/static/site6.css
index 153d693f..5ee062f5 100644
--- a/src/static/site6.css
+++ b/src/static/site6.css
@@ -659,7 +659,7 @@ p .current {
   border-top-color: var(--deep-color);
 }
 
-#cover-art .image {
+#cover-art-container .image {
   display: block;
   width: 100%;
   height: 100%;
diff --git a/tap-snapshots/test/snapshot/generateAlbumCoverArtwork.js.test.cjs b/tap-snapshots/test/snapshot/generateAlbumCoverArtwork.js.test.cjs
index efcb4e95..71d9c55d 100644
--- a/tap-snapshots/test/snapshot/generateAlbumCoverArtwork.js.test.cjs
+++ b/tap-snapshots/test/snapshot/generateAlbumCoverArtwork.js.test.cjs
@@ -15,7 +15,7 @@ exports[`test/snapshot/generateAlbumCoverArtwork.js > TAP > generateAlbumCoverAr
      { name: 'creepy crawlies', isContentWarning: true }
    ]
  ]
- slots: { path: [ 'media.albumCover', 'bee-forus-seatbelt-safebee', 'png' ], color: '#f28514', thumb: 'medium', id: 'cover-art', reveal: true, link: true, square: true }]
+ slots: { path: [ 'media.albumCover', 'bee-forus-seatbelt-safebee', 'png' ], color: '#f28514', thumb: 'medium', reveal: true, link: true, square: true }]
 <ul class="image-details">
     <li><a href="tag/damara/">Damara</a></li>
     <li><a href="tag/cronus/">Cronus</a></li>
diff --git a/tap-snapshots/test/snapshot/generateCoverArtwork.js.test.cjs b/tap-snapshots/test/snapshot/generateCoverArtwork.js.test.cjs
index 9995866c..f16923d0 100644
--- a/tap-snapshots/test/snapshot/generateCoverArtwork.js.test.cjs
+++ b/tap-snapshots/test/snapshot/generateCoverArtwork.js.test.cjs
@@ -15,7 +15,7 @@ exports[`test/snapshot/generateCoverArtwork.js > TAP > generateCoverArtwork (sna
      { name: 'creepy crawlies', isContentWarning: true }
    ]
  ]
- slots: { path: [ 'media.albumCover', 'bee-forus-seatbelt-safebee', 'png' ], thumb: 'medium', id: 'cover-art', reveal: true, link: true, square: true }]
+ slots: { path: [ 'media.albumCover', 'bee-forus-seatbelt-safebee', 'png' ], thumb: 'medium', reveal: true, link: true, square: true }]
 <ul class="image-details">
     <li><a href="tag/damara/">Damara</a></li>
     <li><a href="tag/cronus/">Cronus</a></li>
diff --git a/tap-snapshots/test/snapshot/generateTrackCoverArtwork.js.test.cjs b/tap-snapshots/test/snapshot/generateTrackCoverArtwork.js.test.cjs
index fc16648a..1d21e47d 100644
--- a/tap-snapshots/test/snapshot/generateTrackCoverArtwork.js.test.cjs
+++ b/tap-snapshots/test/snapshot/generateTrackCoverArtwork.js.test.cjs
@@ -15,7 +15,7 @@ exports[`test/snapshot/generateTrackCoverArtwork.js > TAP > generateTrackCoverAr
      { name: 'creepy crawlies', isContentWarning: true }
    ]
  ]
- slots: { path: [ 'media.albumCover', 'bee-forus-seatbelt-safebee', 'png' ], color: '#abcdef', thumb: 'medium', id: 'cover-art', reveal: true, link: true, square: true }]
+ slots: { path: [ 'media.albumCover', 'bee-forus-seatbelt-safebee', 'png' ], color: '#abcdef', thumb: 'medium', reveal: true, link: true, square: true }]
 <ul class="image-details">
     <li><a href="tag/damara/">Damara</a></li>
     <li><a href="tag/cronus/">Cronus</a></li>
@@ -26,7 +26,7 @@ exports[`test/snapshot/generateTrackCoverArtwork.js > TAP > generateTrackCoverAr
 exports[`test/snapshot/generateTrackCoverArtwork.js > TAP > generateTrackCoverArtwork (snapshot) > display: primary - unique art 1`] = `
 [mocked: image
  args: [ [ { name: 'Bees', directory: 'bees', isContentWarning: false } ] ]
- slots: { path: [ 'media.trackCover', 'bee-forus-seatbelt-safebee', 'beesmp3', 'jpg' ], color: '#f28514', thumb: 'medium', id: 'cover-art', reveal: true, link: true, square: true }]
+ slots: { path: [ 'media.trackCover', 'bee-forus-seatbelt-safebee', 'beesmp3', 'jpg' ], color: '#f28514', thumb: 'medium', reveal: true, link: true, square: true }]
 <ul class="image-details"><li><a href="tag/bees/">Bees</a></li></ul>
 `
 
diff --git a/tap-snapshots/test/snapshot/image.js.test.cjs b/tap-snapshots/test/snapshot/image.js.test.cjs
index 9421d393..c68794fa 100644
--- a/tap-snapshots/test/snapshot/image.js.test.cjs
+++ b/tap-snapshots/test/snapshot/image.js.test.cjs
@@ -24,18 +24,6 @@ exports[`test/snapshot/image.js > TAP > image (snapshot) > content warnings via
 </div>
 `
 
-exports[`test/snapshot/image.js > TAP > image (snapshot) > id with link 1`] = `
-<div class="image-container has-link"><a class="image-link" href="foobar" id="banana"><div class="image-inner-area"><img class="image" src="foobar"></div></a></div>
-`
-
-exports[`test/snapshot/image.js > TAP > image (snapshot) > id with square 1`] = `
-<div class="square"><div class="square-content"><div class="image-container"><div class="image-inner-area"><img class="image" id="banana" src="foobar"></div></div></div></div>
-`
-
-exports[`test/snapshot/image.js > TAP > image (snapshot) > id without link 1`] = `
-<div class="image-container"><div class="image-inner-area"><img class="image" id="banana" src="foobar"></div></div>
-`
-
 exports[`test/snapshot/image.js > TAP > image (snapshot) > lazy with square 1`] = `
 <noscript><div class="square"><div class="square-content"><div class="image-container"><div class="image-inner-area"><img class="image" src="foobar"></div></div></div></div></noscript>
 <div class="square js-hide"><div class="square-content"><div class="image-container"><div class="image-inner-area"><img class="image lazy" data-original="foobar"></div></div></div></div>
diff --git a/test/snapshot/image.js b/test/snapshot/image.js
index 2a1e9805..447e7fa7 100644
--- a/test/snapshot/image.js
+++ b/test/snapshot/image.js
@@ -38,29 +38,6 @@ testContentFunctions(t, 'image (snapshot)', async (t, evaluate) => {
     },
   });
 
-  quickSnapshot('id without link', {
-    slots: {
-      src: 'foobar',
-      id: 'banana',
-    },
-  });
-
-  quickSnapshot('id with link', {
-    slots: {
-      src: 'foobar',
-      link: true,
-      id: 'banana',
-    },
-  });
-
-  quickSnapshot('id with square', {
-    slots: {
-      src: 'foobar',
-      square: true,
-      id: 'banana',
-    },
-  });
-
   quickSnapshot('width & height', {
     slots: {
       src: 'foobar',