finishRandomRhymes

dhowe · Aug 18, 2020 · 6cc89ff · 6cc89ff
1 parent 6964aeb
commit 6cc89ff
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/examples/dom/RandomRhymes/code.js b/examples/dom/RandomRhymes/code.js
@@ -1,19 +1,17 @@
 $(function () {
 
   findRhymes();
- 
+
   function findRhymes() {
 
     let word, tmp = '';
     do {
       word = RiTa.randomWord();
-      tmp = RiTa.rhymes(word);
+      tmp = RiTa.rhymes(word,{limit:13});
     } while (tmp.length < 3)
 
-    const rhymes = tmp.slice(0, Math.min(tmp.length, 13));
-
     $('#word').html(word);
-    $('#rhyme').html(rhymes.join("<br>"));
+    $('#rhyme').html(tmp.join("<br>"));
 
     setTimeout(findRhymes, 2000);
   }

diff --git a/examples/dom/RandomRhymes/index.html b/examples/dom/RandomRhymes/index.html
@@ -11,7 +11,7 @@
 <link rel='stylesheet' href='../../lib/prism.css' />
   <style>
 body {
-  font-family: sans-serif;
+  font-family: Georgia,serif;
 }
 .canvas {
   position:relative;
@@ -22,15 +22,15 @@
 }
 #word {
   position:absolute;
-  top:20px;
+  top:15px;
   right:20px;
   font-size: 36px;
   color:white;
   text-align: right;
 }
 #rhyme{
   position:absolute;
-  top:70px;
+  top:65px;
   left:30px;
   font-size: 14px;
   color:white;

diff --git a/examples/p5/RandomRhymes/code.js b/examples/p5/RandomRhymes/code.js
@@ -7,7 +7,6 @@ function setup()
   fill(255);
   textFont("Georgia");
 
-  lexicon = RiTa.lexicon();
   findRhymes();
 
   setInterval(findRhymes, 2000);
@@ -31,10 +30,9 @@ function findRhymes() { // called by timer
 
   let tmp = '';
   do {
-    word = lexicon.randomWord();
-    tmp = lexicon.rhymes(word);
+    word = RiTa.randomWord();
+    tmp = RiTa.rhymes(word,{limit: 13});
   } while ( word && tmp.length < 3)
-
-  const arr = subset(tmp, 0, min(tmp.length, 13)); // max of 13 words
-  rhymes = arr.join("\n");
+  // use argument instead of subsetting afterward
+  rhymes = tmp.join("\n");
 }