Merge branch 'master' of http://git.choozmo.com:3000/choozmo/AI_Anchor_2

html/make_video.html

@@ -151,13 +151,12 @@
                             <option value="7">Peggy</option>
                             <option value="8">Stacy</option>
                             <option value="10">Nina黑</option>
-                            <option value="9">Nina灰</option>
                             <option value="11">Summer韓小夏</option>
                             <option value="12">Jocelyn</option>
                             <option value="13">Angela</option>
                         </select>
-                        <div class="owl-carousel owl-theme d-flex row">
-                            <!-- <div class="card item col" data-avatar="Peggy" data-img="peggy">
+                        <div class="d-flex row">
+                            <div class="card item col" data-avatar="Peggy" data-img="peggy">
                                 <div class="imgfr"><img src="static/img/peggy.webp" class="card-img-top" alt="..."></div>
                                 <div class="card-body">
                                     <h5 class="card-title">Peggy</h5>
@@ -175,12 +174,6 @@
                                     <h5 class="card-title">Nina黑</h5>
                                 </div>
                             </div>
-                            <div class="card item col" data-avatar="Nina灰" data-img="ninawhite">
-                                <div class="imgfr"><img src="static/img/ninawhite.webp" class="card-img-top" alt="..."></div>
-                                <div class="card-body">
-                                    <h5 class="card-title">Nina灰</h5>
-                                </div>
-                            </div>
                             <div class="card item col" data-avatar="Summer韓小夏" data-img="summer">
                                 <div class="imgfr"><img src="static/img/summer.webp" class="card-img-top" alt="..."></div>
                                 <div class="card-body">
@@ -198,7 +191,7 @@
                                 <div class="card-body">
                                     <h5 class="card-title">Angela</h5>
                                 </div>
-                            </div> -->
+                            </div>
                         </div>
                     </fieldset>
                     <fieldset>

html/static/script_util.js

@@ -94,7 +94,7 @@ function getAvatar() {
     }
     $('#avatar').html(`<option set-lan="html:p_choose_character" value="請選擇人物" selected="selected" disabled>>請選擇人物</option>${str}`);
     $('.owl-carousel').html(carStr);
-    card = document.getElementsByClassName('card');
+   // card = document.getElementsByClassName('card');
     console.log(card);
     addCardListener(card);
   }).catch(err => {
@@ -102,8 +102,9 @@ function getAvatar() {
   });
 }
 
-getAvatar();
+//getAvatar();
 
+const card = document.getElementsByClassName('card');
 var client_id = Date.now()
 var tooltipTriggerList = [].slice.call(document.querySelectorAll('[data-bs-toggle="tooltip"]'))
 var tooltipList = tooltipTriggerList.map(function (tooltipTriggerEl) {
@@ -118,18 +119,18 @@ var avatarModal = new bootstrap.Modal(document.getElementById('avatarmega'), {
 var modalImg = document.querySelector("#avatarmega .modal-img");
 var modalTitle = document.querySelector("#avatarmega .modal-title");
 var avatarSelector = document.getElementById("avatar");
-var card = '';
+
 
 avatarSelector.addEventListener('change', avatarChange);
 avatarChange();
 
-function addCardListener(arr) {
-  for (let i = 0; i < arr.length; i++) {
-    arr[i].addEventListener('click', openavatarModel);
+function addCardListener() {
+  for (let i = 0; i < card.length; i++) {
+    card[i].addEventListener('click', openavatarModel);
   }
 }
 
-
+addCardListener();
 function avatarChange() {
   var value = avatarSelector.options[avatarSelector.selectedIndex].text;
   $('.owl-carousel').trigger('to.owl.carousel', avatarSelector.selectedIndex);