Tree Shaking for JS

public_new/archive.html

@@ -111,7 +111,7 @@
   <script src="./js/common/native-bridge-delegate.js"></script>
   <script src="./js/common/native-bridge-datasource.js"></script>
   <script src="./js/common/common.js"></script>
-  <script src="./js/chat-util.js"></script>
+  <script src="./js/utils/chat-util.js"></script>
   <!-- view -->
   <script src="./js/chat.js"></script>
   <script src="./js/chat-ui.js"></script>

public_new/archive_detail.html

@@ -68,7 +68,7 @@
   <script src="./js/common/native-bridge-delegate.js"></script>
   <script src="./js/common/native-bridge-datasource.js"></script>
   <script src="./js/common/common.js"></script>
-  <script src="./js/chat-util.js"></script>
+  <script src="./js/utils/chat-util.js"></script>
   <!-- view -->
   <script src="./js/chat.js"></script>
   <script src="./js/chat-ui.js"></script>

public_new/chat.html

@@ -117,7 +117,7 @@
   <script src="./js/common/native-bridge-delegate.js"></script>
   <script src="./js/common/native-bridge-datasource.js"></script>
   <script src="./js/common/common.js"></script>
-  <script src="./js/chat-util.js"></script>
+  <script src="./js/utils/chat-util.js"></script>
   <!-- View -->
   <script src="./js/chat.js"></script>
   <script src="./js/chat-ui.js"></script>

public_new/chat_add_user.html

@@ -145,7 +145,7 @@
   <script src="./js/common/native-bridge-delegate.js"></script>
   <script src="./js/common/native-bridge-datasource.js"></script>
   <script src="./js/common/common.js"></script>
-  <script src="./js/chat-util.js"></script>
+  <script src="./js/utils/chat-util.js"></script>
   <!-- View -->
   <script src="./js/chat.js"></script>
   <script src="./js/chat-ui.js"></script>

public_new/chat_add_user_confirm.html

@@ -75,7 +75,7 @@
   <script src="./js/common/native-bridge-delegate.js"></script>
   <script src="./js/common/native-bridge-datasource.js"></script>
   <script src="./js/common/common.js"></script>
-  <script src="./js/chat-util.js"></script>
+  <script src="./js/utils/chat-util.js"></script>
   <!-- View -->
   <script src="./js/chat.js"></script>
   <script src="./js/chat-ui.js"></script>

public_new/chat_change_room_name.html

@@ -74,7 +74,7 @@
   <script src="./js/common/native-bridge-delegate.js"></script>
   <script src="./js/common/native-bridge-datasource.js"></script>
   <script src="./js/common/common.js"></script>
-  <script src="./js/chat-util.js"></script>
+  <script src="./js/utils/chat-util.js"></script>
   <!-- View -->
   <script src="./js/chat.js"></script>
   <script src="./js/chat-ui.js"></script>

public_new/chat_make_room.html

@@ -146,7 +146,7 @@
   <script src="./js/common/native-bridge-delegate.js"></script>
   <script src="./js/common/native-bridge-datasource.js"></script>
   <script src="./js/common/common.js"></script>
-  <script src="./js/chat-util.js"></script>
+  <script src="./js/utils/chat-util.js"></script>
   <!-- View -->
   <script src="./js/chat.js"></script>
   <script src="./js/chat-ui.js"></script>

public_new/chat_make_room_confirm.html

@@ -82,7 +82,7 @@
   <script src="./js/common/native-bridge-delegate.js"></script>
   <script src="./js/common/native-bridge-datasource.js"></script>
   <script src="./js/common/common.js"></script>
-  <script src="./js/chat-util.js"></script>
+  <script src="./js/utils/chat-util.js"></script>
   <!-- View -->
   <script src="./js/chat.js"></script>
   <script src="./js/chat-ui.js"></script>

public_new/chat_room.html

@@ -163,7 +163,7 @@
   <script src="./js/common/native-bridge-delegate.js"></script>
   <script src="./js/common/native-bridge-datasource.js"></script>
   <script src="./js/common/common.js"></script>
-  <script src="./js/chat-util.js"></script>
+  <script src="./js/utils/chat-util.js"></script>
   <!-- Socket -->
   <script src="./js/sockets/chat-websocket.js"></script>
   <script src="./js/sockets/chat-websocket-message.js"></script>
@@ -171,6 +171,7 @@
   <!-- View -->
   <script src="./js/chat.js"></script>
   <script src="./js/chat-ui.js"></script>
+  <script src="./js/utils/chat-media-handler.js"></script>
   <script src="./js/chat-room.js"></script>
   <script src="./js/common/loading.js"></script>
 

public_new/collaboration.html

@@ -144,7 +144,7 @@
   <script src="./js/common/native-bridge-delegate.js"></script>
   <script src="./js/common/native-bridge-datasource.js"></script>
   <script src="./js/common/common.js"></script>
-  <script src="./js/chat-util.js"></script>
+  <script src="./js/utils/chat-util.js"></script>
   <!-- Socket -->
   <script src="./js/sockets/chat-websocket.js"></script>
   <script src="./js/sockets/chat-websocket-message.js"></script>

public_new/collaboration_documents.html

@@ -87,7 +87,7 @@
   <script src="./js/common/native-bridge-delegate.js"></script>
   <script src="./js/common/native-bridge-datasource.js"></script>
   <script src="./js/common/common.js"></script>
-  <script src="./js/chat-util.js"></script>
+  <script src="./js/utils/chat-util.js"></script>
   <!-- Socket -->
   <script src="./js/sockets/chat-websocket.js"></script>
   <script src="./js/sockets/chat-websocket-message.js"></script>

public_new/collaboration_picture.html

@@ -148,7 +148,7 @@
   <script src="./js/common/native-bridge-delegate.js"></script>
   <script src="./js/common/native-bridge-datasource.js"></script>
   <script src="./js/common/common.js"></script>
-  <script src="./js/chat-util.js"></script>
+  <script src="./js/utils/chat-util.js"></script>
   <!-- Socket -->
   <script src="./js/sockets/chat-websocket.js"></script>
   <script src="./js/sockets/chat-websocket-message.js"></script>

public_new/collaboration_video.html

@@ -138,7 +138,7 @@
   <script src="./js/common/native-bridge-delegate.js"></script>
   <script src="./js/common/native-bridge-datasource.js"></script>
   <script src="./js/common/common.js"></script>
-  <script src="./js/chat-util.js"></script>
+  <script src="./js/utils/chat-util.js"></script>
   <!-- Socket -->
   <script src="./js/sockets/chat-websocket.js"></script>
   <script src="./js/sockets/chat-websocket-message.js"></script>

public_new/collaboration_voice.html

@@ -83,7 +83,7 @@
   <script src="./js/common/native-bridge-delegate.js"></script>
   <script src="./js/common/native-bridge-datasource.js"></script>
   <script src="./js/common/common.js"></script>
-  <script src="./js/chat-util.js"></script>
+  <script src="./js/utils/chat-util.js"></script>
   <!-- Socket -->
   <script src="./js/sockets/chat-websocket.js"></script>
   <script src="./js/sockets/chat-websocket-message.js"></script>

public_new/collaboration_whiteboard.html

@@ -140,7 +140,7 @@
   <script src="./js/common/native-bridge-delegate.js"></script>
   <script src="./js/common/native-bridge-datasource.js"></script>
   <script src="./js/common/common.js"></script>
-  <script src="./js/chat-util.js"></script>
+  <script src="./js/utils/chat-util.js"></script>
   <!-- Socket -->
   <script src="./js/sockets/chat-websocket.js"></script>
   <script src="./js/sockets/chat-websocket-message.js"></script>

public_new/contact.html

@@ -194,7 +194,7 @@
   <script src="./js/common/native-bridge-delegate.js"></script>
   <script src="./js/common/native-bridge-datasource.js"></script>
   <script src="./js/common/common.js"></script>
-  <script src="./js/chat-util.js"></script>
+  <script src="./js/utils/chat-util.js"></script>
   <!-- View -->
   <script src="./js/chat.js"></script>
   <script src="./js/chat-ui.js"></script>

public_new/js/chat-ui-clickEvents.js

@@ -17,79 +17,6 @@ $("#messageInput").on("keypress", function (event) {
   }
 });
 
-// 写真アップロード
-$("#imageInputButton").on("click", function () {
-  $("#imageInputTag").click();
-});
-
-// 動画アップロード
-$("#videoUploadButton").on("click", function () {
-  $("#videoInputTag").click();
-});
-
-$("#imageInputTag").on("change", function () {
-  $("#image-form").submit();
-  // reset the value of form
-  $("#imageInputTag").val("");
-});
-
-$("#videoInputTag").on("change", function () {
-  $("#video-form").submit();
-  // reset the value of form
-  $("#videoInputTag").val("");
-});
-
-$("#image-form").on("submit", function (e) {
-  e.preventDefault();
-  const imageInputTag = $("#imageInputTag");
-  const file = imageInputTag.prop("files")[0];
-  if (file) {
-    $(".overlay").addClass("active undismissable");
-    $(".loader").addClass("active");
-    CHAT_UI.showLoadingIndicator();
-    var fd = new FormData($(this)[0]);
-    console.log($(this)[0]);
-    //画像の大きさが500pixelより大きかったら、thumbnailを生成
-    CHAT.createThumbnailAndUpload(
-      file,
-      function (resizeFile, thumbnailCreated) {
-        if (resizeFile && thumbnailCreated) {
-          //ただ、画像の大きさが500pixel以下の場合はthumbnailは生成されない
-          fd.append("thumb", resizeFile);
-        }
-
-        // イメージをアップロード
-        CHAT.uploadImage(fd);
-      }
-    );
-  }
-});
-
-$("#video-form").on("submit", function (e) {
-  e.preventDefault();
-  const videoInputTag = $("#videoInputTag");
-  const file = videoInputTag.prop("files")[0];
-  if (file) {
-    $(".overlay").addClass("active undismissable");
-    $(".loader").addClass("active");
-    CHAT_UI.showLoadingIndicator();
-    var fd = new FormData($(this)[0]);
-
-    if (!file.type.includes("image")) {
-      // video 保存
-      // CHAT.createVideoThumbnailAndUpload(file, function(resizeFile, thumbnailCreated) {
-      //     if(resizeFile && thumbnailCreated) {
-      //         //ただ、画像の大きさが500pixel以下の場合はthumbnailは生成されない
-      //         fd.append('thumb', resizeFile)
-      //     }
-      //     CHAT.uploadImage(fd);
-      // })
-      CHAT.uploadImage(fd);
-      return;
-    }
-  }
-});
-
 $("#tabDM").on("click", function (e) {
   CHAT_UI.refreshRoomList(ChatRoomType.DM);
 });

public_new/js/chat-ui.js

@@ -78,22 +78,6 @@ CHAT_UI.scrollToBottom = function () {
   );
 };
 
-CHAT_UI.scrollToLastMarkedUnseen = function (value) {
-  let target = $("[data-markjs=true]:not([data-seen=true])").last();
-  let messages = $("#messages");
-  if (target.length > 0) {
-    messages.scrollTop(
-      target.prop("offsetTop") -
-        target.prop("offsetHeight") -
-        messages.prop("offsetHeight") +
-        target.parent().parent().height()
-    );
-    target.attr("data-seen", true);
-  } else {
-    messages.scrollTop(0);
-  }
-};
-
 //loadingIndicatorを表示
 CHAT_UI.showLoadingIndicator = function () {
   var h = $(window).height();

public_new/js/utils/chat-media-handler.js

+var chatMediaHandler = {};
+
+/**
+ *    Image Upload 
+ **/
+// 写真アップロード
+$("#imageInputButton").on("click", function () {
+  $("#imageInputTag").click();
+});
+
+$("#imageInputTag").on("change", function () {
+  $("#image-form").submit();
+  // reset the value of form
+  $("#imageInputTag").val("");
+});
+
+$("#image-form").on("submit", function (e) {
+  e.preventDefault();
+  const imageInputTag = $("#imageInputTag");
+  const file = imageInputTag.prop("files")[0];
+  if (file) {
+    $(".overlay").addClass("active undismissable");
+    $(".loader").addClass("active");
+    CHAT_UI.showLoadingIndicator();
+    var fd = new FormData($(this)[0]);
+    console.log($(this)[0]);
+    //画像の大きさが500pixelより大きかったら、thumbnailを生成
+    CHAT.createThumbnailAndUpload(
+      file,
+      function (resizeFile, thumbnailCreated) {
+        if (resizeFile && thumbnailCreated) {
+          //ただ、画像の大きさが500pixel以下の場合はthumbnailは生成されない
+          fd.append("thumb", resizeFile);
+        }
+
+        // イメージをアップロード
+        CHAT.uploadImage(fd);
+      }
+    );
+  }
+});
+
+/**
+ *    Video Upload 
+ **/
+// 動画アップロード
+$("#videoUploadButton").on("click", function () {
+  $("#videoInputTag").click();
+});
+
+$("#videoInputTag").on("change", function () {
+  $("#video-form").submit();
+  // reset the value of form
+  $("#videoInputTag").val("");
+});
+
+$("#video-form").on("submit", function (e) {
+  e.preventDefault();
+  const videoInputTag = $("#videoInputTag");
+  const file = videoInputTag.prop("files")[0];
+  if (file) {
+    $(".overlay").addClass("active undismissable");
+    $(".loader").addClass("active");
+    CHAT_UI.showLoadingIndicator();
+    var fd = new FormData($(this)[0]);
+
+    if (!file.type.includes("image")) {
+      // video 保存
+      // CHAT.createVideoThumbnailAndUpload(file, function(resizeFile, thumbnailCreated) {
+      //     if(resizeFile && thumbnailCreated) {
+      //         //ただ、画像の大きさが500pixel以下の場合はthumbnailは生成されない
+      //         fd.append('thumb', resizeFile)
+      //     }
+      //     CHAT.uploadImage(fd);
+      // })
+      CHAT.uploadImage(fd);
+      return;
+    }
+  }
+});