X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/526bd96bb807284eb1a787a1203111576074915d..43d481448a3819d58326be4587eadbedcf486e46:/word/finder.js

diff --git a/word/finder.js b/word/finder.js
index 86442c9..9d2b6cf 100644
--- a/word/finder.js
+++ b/word/finder.js
@@ -1,6 +1,5 @@
 class WordFinder extends WordQuiz {
 	namehtml(name) {
-		//let wbr = new RegExp('\w{4} [^aoeuiyc\W] [rl]?+ \K (?= [^aoeuiy\W] [rl]? [aoeuiy] \w)', 'g');
 		let aliases = name.split('/');
 		let html = aliases.shift();
 		html = html.replace(/\((.+)\)/, '<small>$1</small>');
@@ -11,28 +10,32 @@ class WordFinder extends WordQuiz {
 	}
 
 	add(catitem, rows) {
-		rows.forEach(ref => {
-			const [title, level, imgid, subs] = this.data[ref];
+		rows.forEach(word => {
+			if (!word) return;
 			const worditem = put(catitem, 'li');
 			const figitem = put(worditem, 'figure');
-			if (imgid) {
-				put(figitem, 'img[src=$]', `/data/word/32/${imgid}.jpg`);
+			if (word.imgid) {
+				put(figitem, 'img[src=$]', word.thumb());
 			}
-			if (title) {
+			if (word.title) {
 				put(figitem, 'figcaption', {
-					innerHTML: this.namehtml(title),
+					innerHTML: this.namehtml(word.title),
 				});
 			}
-			if (level <= 1 && subs.length >= 4) {
+			put(worditem, '.level' + word.level);
+			if (word.level <= 1 && word.subs.length >= 4) {
 				put(worditem, '.large');
 			}
-			if (subs.length) {
+			if (word.subs.length) {
 				// delve into subcategory
 				put(worditem, '.parent');
-				this.add(put(worditem, 'ul'), subs);
+				const expansion = put(worditem, 'ul');
+				//expansion.style.display = 'none';
+				this.add(expansion, word.subs);
+				//worditem.onclick = () => expansion.style.display = '';
 			}
 			if (this.preset.debug) {
-				put(figitem, '[title=$]', `id ${ref} level ${level}`);
+				put(figitem, '[title=$]', `id ${word.id} level ${word.level}`);
 			}
 		});
 	}
@@ -45,9 +48,12 @@ class WordFinder extends WordQuiz {
 
 	setup() {
 		super.setup();
+		if (this.preset.debug) {
+			put(document.head, 'link', {rel: 'stylesheet', href: '/word/debug.css'});
+		}
 		this.form.innerHTML = '';
 		put(this.form, 'p', 'Under construction.');
-		for (let cat of this.preset.cat || this.data[''][3]) {
+		for (let cat of this.data.root()) {
 			this.add(put(this.form, 'ul.gallery'), [cat]);
 		}
 	}