Merge branch 'develop' of gitlab.agentec.jp:abookCommunication/chat_webview into…

Merge branch 'develop' of gitlab.agentec.jp:abookCommunication/chat_webview into features/release_sp3_collaboration_document

# Conflicts:
#	public_new/js/share.js

public_new/chat_room.html

@@ -124,12 +124,10 @@
             </a>
             </a>
           </div>
           </div>
           <!--リリース後開発予定-->
           <!--リリース後開発予定-->
-          <!--<div class="footer_item">
-            <a href="collaboration_whiteboard.html">
-              <img src="icon/icon_whiteboad_gray.png" alt="ホワイトボードアイコン">
+          <div class="footer_item">
+              <img src="icon/icon_whiteboard_gray.png" alt="ホワイトボードアイコン" onclick="alert(getLocalizedString('notify_not_released'));">
               <p>ボード</p>
               <p>ボード</p>
-            </a>
-          </div>-->
+          </div>
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>

public_new/collaboration_documents_overlay_menu.html

@@ -30,7 +30,7 @@
           <div class="item">
           <div class="item">
             <a href="collaboration_whiteboard.html" class="d-flex flex-column align-items-center">
             <a href="collaboration_whiteboard.html" class="d-flex flex-column align-items-center">
               <div class="img_wrap">
               <div class="img_wrap">
-                <img src="icon/icon_collabo_whiteboad.png" alt="落書き">
+                <img src="icon/icon_collabo_whiteboard.png" alt="落書き">
               </div>
               </div>
               <span>落書き</span>
               <span>落書き</span>
             </a>
             </a>

public_new/collaboration_picture_overlay_menu.html

@@ -30,7 +30,7 @@
           <div class="item">
           <div class="item">
             <a href="collaboration_whiteboard.html" class="d-flex flex-column align-items-center">
             <a href="collaboration_whiteboard.html" class="d-flex flex-column align-items-center">
               <div class="img_wrap">
               <div class="img_wrap">
-                <img src="icon/icon_collabo_whiteboad.png" alt="落書き">
+                <img src="icon/icon_collabo_whiteboard.png" alt="落書き">
               </div>
               </div>
               <span>落書き</span>
               <span>落書き</span>
             </a>
             </a>

public_new/collaboration_video_overlay_menu.html

@@ -30,7 +30,7 @@
           <div class="item">
           <div class="item">
             <a href="collaboration_whiteboard.html" class="d-flex flex-column align-items-center">
             <a href="collaboration_whiteboard.html" class="d-flex flex-column align-items-center">
               <div class="img_wrap">
               <div class="img_wrap">
-                <img src="icon/icon_collabo_whiteboad.png" alt="落書き">
+                <img src="icon/icon_collabo_whiteboard.png" alt="落書き">
               </div>
               </div>
               <span>落書き</span>
               <span>落書き</span>
             </a>
             </a>

public_new/collaboration_voice_overlay_menu.html

@@ -30,7 +30,7 @@
           <div class="item">
           <div class="item">
             <a href="collaboration_whiteboard.html" class="d-flex flex-column align-items-center">
             <a href="collaboration_whiteboard.html" class="d-flex flex-column align-items-center">
               <div class="img_wrap">
               <div class="img_wrap">
-                <img src="icon/icon_collabo_whiteboad.png" alt="落書き">
+                <img src="icon/icon_collabo_whiteboard.png" alt="落書き">
               </div>
               </div>
               <span>落書き</span>
               <span>落書き</span>
             </a>
             </a>

public_new/js/chat-websocket.js

@@ -193,13 +193,13 @@ function setSocketAction () {
         } catch(e) {
         } catch(e) {
             message.text = message.text
             message.text = message.text
         }
         }
-        let messageType;
+        let type;
         let collaborationType;
         let collaborationType;
         if ( message.text.includes(messageSeperator) ) {
         if ( message.text.includes(messageSeperator) ) {
             let text = message.text.split(messageSeperator);
             let text = message.text.split(messageSeperator);
             message.text = text[0];
             message.text = text[0];
-            messageType = text[1];
-            if (messageType == messageType.COMMUNICATIONSTART || messageType == messageType.COMMUNICATIONEND) {
+            type = text[1];
+            if (type == messageType.COMMUNICATIONSTART || type == messageType.COMMUNICATIONEND) {
                 collaborationType = text[2];
                 collaborationType = text[2];
                 var userInCollaboration;
                 var userInCollaboration;
                 if (CHAT_UTIL.isIOS()) {
                 if (CHAT_UTIL.isIOS()) {