Merge branch 'develop' into debug/console_logs

# Conflicts:
#	public_new/js/views/collaboration/collaboration-add-user.js
#	public_new/js/views/collaboration/collaboration.js

public_new/css/collaboration.css

@@ -486,6 +486,10 @@
   margin: auto 0;
 }
 
+.coview_on_media_image_crown {
+  visibility: hidden;
+}
+
 /**************************** modal *************************/
 #captyaModal .modal-header span,
 #changeHostModal .modal-header span,

public_new/js/views/collaboration/collaboration-add-user.js

@@ -5,7 +5,7 @@ CollaborationUI.initialBindAddUserButton = function () {
     console.log(
       "peacekim:: CollaborationUI.initialBindAddUserButton add_user_btn clicked"
     );
-    CollaborationUI.bindEnableScroll();
+    CollaborationUI.enableScroll();
     Common.showLoadingIndicator();
     ChatManagementCommon.selectedUserList = [];
     CollaborationUI.refreshMyGroupForAddUserInCollaboration();

public_new/js/views/collaboration/collaboration.js

@@ -2,7 +2,7 @@ var CollaborationUI = {};
 
 document.addEventListener("DOMContentLoaded", function () {
   console.log("peacekim:: DOMContentLoaded on collaboration js");
-  CollaborationUI.bindDisableScroll();
+  CollaborationUI.disableScroll();
 
   // メニューオーバーレイ表示
   CollaborationUI.bindMenuButton();
@@ -37,30 +37,36 @@ CollaborationUI.bindMenuButton = function () {
 
 CollaborationUI.bindDisplayUsersButton = function () {
   $(".user_btn").click(function () {
-    var w = $(this).width();
-
+    const width = $(this).width();
+    $("#overlay_user_list.overlay").stop();
     $(this).toggleClass("hide");
     $("#overlay_user_list.overlay")
       .toggleClass("slidein")
-      .css({ transform: "translateX(" & -w & ")" });
+      .animate({ left: "+=width" }, 500, function () {
+        scrollTo(0, 0);
+      });
 
     if ($(this).hasClass("hide")) {
-      CollaborationUI.bindEnableScroll();
+      CollaborationUI.enableScroll();
     } else {
-      scrollTo(0, 0);
-      CollaborationUI.bindDisableScroll();
+      CollaborationUI.disableScroll();
     }
   });
 };
+function aa() {
+  $("#overlay_user_list.overlay").on("slide.bs.carousel", function () {
+    console.log("peacekim:: #overlay_user_list.overlay moved");
+  });
+}
 
 CollaborationUI.userListSlideOut = function () {
-  const w = $(".user_btn").width();
+  const userButtonWidth = $(".user_btn").width();
   $(".user_btn").removeClass("hide");
   $("#overlay_user_list.overlay")
     .removeClass("slidein")
-    .css({ transform: "translateX(" & -w & ")" });
+    .css({ transform: "translateX(" & -userButtonWidth & ")" });
   scrollTo(0, 0);
-  CollaborationUI.bindDisableScroll();
+  CollaborationUI.disableScroll();
 };
 
 CollaborationUI.bindChangeHostButton = function () {
@@ -78,7 +84,7 @@ CollaborationUI.bindCloseButton = function () {
   console.log("peacekim:: CollaborationUI.bindCloseButton");
   $(".close_btn").click(function () {
     scrollTo(0, 0);
-    CollaborationUI.bindDisableScroll();
+    CollaborationUI.disableScroll();
   });
 };
 
@@ -91,7 +97,7 @@ CollaborationUI.bindInviteButton = function () {
 /*********************************
  *  Scroll Controls
  ********************************/
-CollaborationUI.bindDisableScroll = function () {
+CollaborationUI.disableScroll = function () {
   console.log("peacekim:: CollaborationUI.bindDisableScroll");
   document.addEventListener("mousewheel", CollaborationUI.scrollControl, {
     passive: false,
@@ -102,7 +108,7 @@ CollaborationUI.bindDisableScroll = function () {
 };
 
 // スクロール禁止解除
-CollaborationUI.bindEnableScroll = function () {
+CollaborationUI.enableScroll = function () {
   console.log("peacekim:: CollaborationUI.bindEnableScroll");
   document.removeEventListener("mousewheel", CollaborationUI.scrollControl, {
     passive: false,