Merge branch 'feature/develop_reset_pen_status_on_change__host_and_collaboration' into 'develop'

ホスト権限が更新された場合ペン状態をOFFにする

See merge request !138

public_new/js/collaboration.js

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

public_new/js/share.js

@@ -176,6 +176,8 @@ $(function () {
         } else {
         } else {
           Coview_changeHost(data.payload.loginId);
           Coview_changeHost(data.payload.loginId);
         }
         }
+      } else if (data.type === "API_SEND_OWNER_CHANGE_COMPLETE") {
+        penOff();
       }
       }
     });
     });
   });
   });
@@ -407,6 +409,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()) {
@@ -423,6 +426,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');