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

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

# Conflicts:
#	public_new/js/share.js

public_new/js/collaboration.js

@@ -142,3 +142,11 @@ $(function () {
     }
     }
   })
   })
 });
 });
+
+function penOff() {
+  if ($('#penBtn').hasClass('bg_blue')) {
+    $('#coviewPenCtrBtn').click();
+    $('#penBtn').addClass('bg_red');
+    $('#penBtn').removeClass('bg_blue');
+  }
+};

public_new/js/share.js

@@ -180,6 +180,7 @@ $(function () {
         if ($('#recordBtn').hasClass('bg_red')) {
         if ($('#recordBtn').hasClass('bg_red')) {
           recordStop();
           recordStop();
         }
         }
+        penOff();
       }
       }
     });
     });
   });
   });
@@ -414,6 +415,7 @@ function changeCollaboration(changeCollaborationType) {
       coview_api.ChangeCollaboration('audio');
       coview_api.ChangeCollaboration('audio');
       break;
       break;
   }
   }
+  penOff();
   if (CHAT_UTIL.isIOS()) {
   if (CHAT_UTIL.isIOS()) {
     webkit.messageHandlers.changeCollaboration.postMessage({"changeCollaborationType": changeCollaborationType, "meetingId": newMeetingId});
     webkit.messageHandlers.changeCollaboration.postMessage({"changeCollaborationType": changeCollaborationType, "meetingId": newMeetingId});
   } else if (CHAT_UTIL.isAndroid()) {
   } else if (CHAT_UTIL.isAndroid()) {
@@ -430,6 +432,7 @@ function initCollaborationUI(changeCollaborationType){
     $(".menu_btn").click();
     $(".menu_btn").click();
   }
   }
   $("link[href='./css/collaboration_board.css']").remove();
   $("link[href='./css/collaboration_board.css']").remove();
+  penOff();
   switch (changeCollaborationType) {
   switch (changeCollaborationType) {
     case COLLABORATION_TYPE.AUDIO:
     case COLLABORATION_TYPE.AUDIO:
       $('.collaboration_contents').addClass('none');
       $('.collaboration_contents').addClass('none');