Merge branch 'release_sp3' into features/release_sp3_collaboration_audio

public_new/chat_room.html

@@ -150,6 +150,7 @@
   <script src="./js/libs/jquery.mark.min.js"></script>
   <script src="./js/common.js"></script>
   <script src="./js/language.js"></script>
+  <script src="./js/loading.js"></script>
   <script src="./js/language_ko.js" charset="UTF-8"></script>
   <script src="./js/language_ja.js" charset="UTF-8"></script>
   <script src="./js/language_en.js" charset="UTF-8"></script>
@@ -169,6 +170,7 @@
     String.prototype.replaceAll = function(org, dest) {
       return this.split(org).join(dest);
     }
+    $("#loadingArea").load("./loading.html");
 
     let CHAT_SERVER_URL = '';
     let CMS_SERVER_URL = '';

public_new/css/common.css

@@ -174,6 +174,9 @@ main {
   width: 100%;
   text-align: center;
 }
+.modal-header {
+  width: 100%;
+}
 .profile_modal .modal-header .profile_name span {
     line-height: 60px;
     font-weight: bold;

public_new/css/footer.css

@@ -38,6 +38,7 @@ footer .footer_item p {
   color: #707070;
   font-weight: bold;
   margin: 0;
+  white-space: nowrap;
 }
 footer .footer_item .active {
   color: #0070ca;

public_new/js/chat-db.js

@@ -289,6 +289,18 @@ CHAT_DB.addFavoriteUser = function(shopMemberId) {
     }
 };
 
+CHAT_DB.removeFavoriteGroup = function(groupId) {
+    // Androidは実装不要
+    if (CHAT_UTIL.isIOS()) {
+        var result = callNativeApp("removeFavoriteGroup", {"groupId": groupId});
+        if (result == "true") {
+            return true;
+        } else {
+            return false;
+        } 
+    }
+};
+
 CHAT_DB.addFavoriteGroup = function(groupId) {
     // Androidは実装不要
     if (CHAT_UTIL.isIOS()) {

public_new/js/chat-ui.js

@@ -554,8 +554,8 @@ CHAT_UI.scrollToBottom = function() {
     const scrollHeight = messages.prop('scrollHeight');
     //messages.scrollTop(scrollHeight);
     $('html, body').animate({
-        scrollTop: 9999999
-    }, 500);
+        scrollTop: scrollHeight
+    }, 100);
 };
 
 CHAT_UI.scrollToLastMarkedUnseen = function(value) {
@@ -879,6 +879,24 @@ CHAT_UI.htmlElementTextInitialize = function(languageCode) {
 
 // 画像の読み込みが全て終わったタイミングでコールバック実行
 // FIXME 追加読み込みの場合は差分の画像のみ監視すべきだが、現状新規入室時にしか対応出来ていない。
+CHAT_UI.waitForLoadingVideo = function(div, callback) {
+    CHAT_UI.showLoadingIndicator();
+//    var imgs = document.getElementsByTagName("video");
+    var video = div.find("video");
+    var count = video.length;
+    if (count==0) callback();
+    var loaded = 0;
+    video.each( function() {
+        this.addEventListener('loadeddata', function(e) {
+                 loaded++;
+                 if ( loaded === count ) {
+                     callback();
+                     CHAT_UI.dismissLoadingIndicator();
+                 }
+        });
+    });
+}
+
 CHAT_UI.waitForLoadingImage = function(div, callback) {
     var imgs = div.find("img");
     console.log(imgs);
@@ -897,10 +915,8 @@ CHAT_UI.waitForLoadingImage = function(div, callback) {
         if ( this.complete || this.readyState === readyState.COMPLETED ) {
             $(this).trigger("load");
         }
-
     });
 }
-
 $('#contactButton').on('click', function(event) {
     CHAT_UI.refreshContactScreen();
 });
@@ -1323,27 +1339,13 @@ CHAT_UI.loadMessages = function(roomId, roomName) {
             workVal = html + workVal;
         }
     })
-
     // メッセージの画面描画
     jQueryMessages.prepend(workVal);
-    if (beforeHeight !== 0) {
-        // 追加のメッセージ読み込み時は読み込み前のスクロール位置を維持
-        setTimeout(function() {
-            jQueryMessages.scrollTop(jQueryMessages.prop('scrollHeight') - beforeHeight);
-        }, 400);
-    } else {
-        // 新規に入室の場合は最下部へスクロール
-        CHAT_UI.waitForLoadingImage(jQueryMessages, CHAT_UI.scrollToBottom);
-        // タブレット等、画面サイズが大きい場合、スクロール出来なくならないよう追加で10件メッセージを取得
-        if ($(window).height() > jQueryMessages.height()) {
-            $('#messages').scroll();
-        }
-    }
+
     CHAT_UI.waitForLoadingImage(jQueryMessages, CHAT_UI.scrollToBottom);
+    CHAT_UI.waitForLoadingVideo(jQueryMessages, CHAT_UI.scrollToBottom);
     // ユーザ削除ボタン表示しない
     $("#userSelectionDeleteBtn").hide();
-    setInterval(updateDuration, 1000);
-    CHAT_UI.scrollToBottom();
 };
 
 
@@ -1469,7 +1471,7 @@ CHAT_UI.removeFavoriteGroup = function(groupId) {
     if (typeof(android) != "undefined") {
         result = android.removeFavoriteGroup(groupId);
     } else {
-        result = webkit.messageHandlers.removeFavoriteGroup.postMessage(groupId);
+        result = CHAT_DB.removeFavoriteGroup(groupId);
     }
     if (!result) {
         $('.group_'+groupId).addClass('active');
@@ -2166,7 +2168,6 @@ CHAT_UI.showAddUserConfirmView = function() {
 
     var selectedUserList = CHAT_DB.loadSelectedUsers();
 
-    console.log("check = " + selectedUserList);
     selectedUserList.forEach(function(user){
          let html = Mustache.render(userTemplate, {
                  id: user.shopMemberId,
@@ -2430,8 +2431,12 @@ CHAT_UI.refreshForOffline = function() {
 
 CHAT_UI.displayExistRoom = function(roomId) {
     if (confirm('error_already_exist_same_user')) {
+        if (CHAT_UTIL.isIOS()) {
+            webkit.messageHandlers.joinRoom.postMessage({"roomId": roomId});
+        } else if (CHAT_UTIL.isAndroid()) {
             android.joinRoom(roomId, '');
         }
+    }
     return;
 }
 

public_new/js/chat.js

@@ -87,7 +87,7 @@ CHAT.createVideoThumbnailAndUpload = function(sourceImage, callback) {
         // Load video in Safari / IE11
         video.muted = true;
         video.playsInline = true;
-        video.play();
+        video.pause();
     };
     fileReader.readAsArrayBuffer(sourceImage);
 }
@@ -409,10 +409,6 @@ $(function() {
             $('.overlay_src_msg').append(noResultMsg);
         }
 
-        if (CHAT_UI.isLandscapeMode()) {
-            $(".chat_list").removeClass("col-12").addClass("col-6");
-        }
-
         if (e.KeyCode == 13 || e.key == "Enter") {
             $('#chat .search_form input[type="search"]').blur();
             return ;