Merge pull request #38 from etrusci-org/dev

Dev
etrusci-org · Aug 4, 2023 · 2534694 · 2534694
2 parents 676b211 + f3831cc
commit 2534694
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 9 deletions.
diff --git a/app/mod/chat/chat.conf.js b/app/mod/chat/chat.conf.js
@@ -1,4 +1,4 @@
-// For help see chat.md
+// For help see chat/README.md
 
 export const modConf = {
     channels: `

diff --git a/app/mod/clock/clock.conf.js b/app/mod/clock/clock.conf.js
@@ -1,4 +1,4 @@
-// For help see clock.md
+// For help see clock/README.md
 
 export const modConf = {
     updaterate: '1000',

diff --git a/app/mod/colorfader/colorfader.conf.js b/app/mod/colorfader/colorfader.conf.js
@@ -1,4 +1,4 @@
-// For help see colorfader.md
+// For help see colorfader/README.md
 
 export const modConf = {
     delay: '0',

diff --git a/app/mod/goal/goal.conf.js b/app/mod/goal/goal.conf.js
@@ -1,4 +1,4 @@
-// For help see goal.md
+// For help see goal/README.md
 
 export const modConf = {
     description: 'Current Goal Status',

diff --git a/app/mod/numbers/numbers.conf.js b/app/mod/numbers/numbers.conf.js
@@ -1,4 +1,4 @@
-// For help see numbers.md
+// For help see numbers/README.md
 
 export const modConf = {
     updaterate: '3000',

diff --git a/app/mod/quotes/quotes.conf.js b/app/mod/quotes/quotes.conf.js
@@ -1,4 +1,4 @@
-// For help see quotes.md
+// For help see quotes/README.md
 
 export const modConf = {
     updaterate: '90000',

diff --git a/app/mod/rotator/README.md b/app/mod/rotator/README.md
@@ -42,7 +42,8 @@ Valid: `text, HTML`
 
 Start each item with `|`.  
 Separate sub-items with `*`.  
-Prefix image URL/paths with `img:`.
+Prefix image URL/paths with `img:`.  
+Prefix video URL/paths with `vid:`.
 
 Example:
 ```js
@@ -52,6 +53,7 @@ items: `
     |img:https://example.org/test.png
     |text before image*img:https://example.org/test.png
     |img:https://example.org/test.png*text after image
+    |vid:https://example.org/test.mp4
 `
 ```
 
@@ -63,7 +65,9 @@ items: `
 
 ```html
 <div class="mod rotator">
-    {quote_text}
+    [<div class="txt">{text}</div>]
+    [<div class="img"><img src="{image}" alt="{image}"></div>]
+    [<div class="vid"><video src="{video}" autoplay="true" loop="true" playsinline="true"></video></div>]
 </div>
 ```
 
@@ -78,6 +82,9 @@ items: `
 
 .img > img {} /* Image tags inside image items */
 
+.vid {} /* Video items */
+
+.vid > video {} /* Video tags inside video items */
 ```
 
 ---
diff --git a/app/mod/rotator/rotator.conf.js b/app/mod/rotator/rotator.conf.js
@@ -1,4 +1,4 @@
-// For help see rotator.md
+// For help see rotator/README.md
 
 export const modConf = {
     updaterate: '10000',

diff --git a/app/mod/rotator/rotator.js b/app/mod/rotator/rotator.js
@@ -35,6 +35,9 @@ export class Mod extends ModBase
             if (itemPart.startsWith('img:')) {
                 out += `<div class="img"><img src="${itemPart.substr(4)}" alt="${itemPart}"></div>`
             }
+            else if (itemPart.startsWith('vid:')) {
+                out += `<div class="vid"><video src="${itemPart.substr(4)}" autoplay="true" loop="true" playsinline="true"></video></div>`
+            }
             else {
                 out += `<div class="txt">${itemPart}</div>`
             }