fix: update initParamsValidationRules

donkeyclip · Jun 28, 2022 · de61416 · de61416
1 parent 5599853
commit de61416
Show file tree

Hide file tree

Showing 5 changed files with 206 additions and 282 deletions.
diff --git a/clip/clip.css b/clip/clip.css
@@ -1,9 +1,9 @@
 * {
-  --backgroundColor: {{ initParams.backgroundColor }};
-  --basicColor: {{ initParams.basicColor}};
-  --secondaryColor:{{ initParams.secondaryColor}};
-  --tertiaryColor:{{initParams.tertiaryColor}};
-  --whiteCubeEffectColor:{{initParams.whiteCubeEffectColor}}
+  --backgroundColor: {{ initParams.styles.backgroundColor }};
+  --basicColor: {{ initParams.styles.basicColor}};
+  --secondaryColor:{{ initParams.styles.secondaryColor}};
+  --tertiaryColor:{{initParams.styles.tertiaryColor}};
+  --whiteCubeEffectColor:{{initParams.styles.whiteCubeEffectColor}}
 }
 
 .root {

diff --git a/clip/clip.html b/clip/clip.html
@@ -34,12 +34,12 @@
       </div>
       <div class="box">
         <div class="text1">
-          <div class="letter" mc-for="key,item" mc-of="initParams.text1">
+          <div class="letter" mc-for="key,item" mc-of="initParams.title.text1">
             {{item}}
           </div>
         </div>
         <div class="text2">
-          <div class="letter" mc-for="key,item" mc-of="initParams.text2">
+          <div class="letter" mc-for="key,item" mc-of="initParams.title.text2">
             {{item}}
           </div>
         </div>
@@ -82,12 +82,12 @@
         <div class="cube-face cube-face-top">
           <div class="text">
             <div class="text1">
-              <div class="letter" mc-for="key,item" mc-of="initParams.text1">
+              <div class="letter" mc-for="key,item" mc-of="initParams.title.text1">
                 {{item}}
               </div>
             </div>
             <div class="text2">
-              <div class="letter" mc-for="key,item" mc-of="initParams.text2">
+              <div class="letter" mc-for="key,item" mc-of="initParams.title.text2">
                 {{item}}
               </div>
             </div>
@@ -325,12 +325,12 @@
         <div class="cube-face cube-face-top">
           <div class="text">
             <div class="text1">
-              <div class="letter" mc-for="key,item" mc-of="initParams.text1">
+              <div class="letter" mc-for="key,item" mc-of="initParams.title.text1">
                 {{item}}
               </div>
             </div>
             <div class="text2">
-              <div class="letter" mc-for="key,item" mc-of="initParams.text2">
+              <div class="letter" mc-for="key,item" mc-of="initParams.title.text2">
                 {{item}}
               </div>
             </div>

diff --git a/clip/initParams.js b/clip/initParams.js
@@ -3,13 +3,17 @@ export const initParams = [
     name: "Default",
     value: {
       song: "https://donkeyclip.github.io/news-clip/demo/assets/news-audio.mp3",
-      backgroundColor: "white",
-      basicColor: "black",
-      secondaryColor: "#fac132",
-      tertiaryColor: "#fa2020",
-      whiteCubeEffectColor: "#bbc6c9",
-      text1: "Cube",
-      text2: "news",
+      styles:{
+        backgroundColor: "white",
+        basicColor: "black",
+        secondaryColor: "#fac132",
+        tertiaryColor: "#fa2020",
+        whiteCubeEffectColor: "#bbc6c9",
+      },
+      title:{
+        text1: "Cube",
+        text2: "news",
+      },
       slide1: {
         video:
           "https://donkeyclip.github.io/news-clip/demo/assets/man-and-woman-talk.mp4",