Merge branch 'origin/#42572_send_movie' into 'release_sp3'

iOSで動画が送信できないバグを修正

See merge request !94

public_new/js/chat-ui.js

@@ -269,13 +269,14 @@ $('#video-form').on('submit', function(e) {
         var fd = new FormData($(this)[0]);
         var fd = new FormData($(this)[0]);
 
 
         if(!file.type.includes("image")) { // video 保存
         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.createVideoThumbnailAndUpload(file, function(resizeFile, thumbnailCreated) {
+            //     if(resizeFile && thumbnailCreated) {
+            //         //ただ、画像の大きさが500pixel以下の場合はthumbnailは生成されない
+            //         fd.append('thumb', resizeFile)
+            //     }
+            //     CHAT.uploadImage(fd);
+            // })
+            CHAT.uploadImage(fd);
             return;
             return;
         }
         }
     }
     }

public_new/js/chat.js

@@ -102,7 +102,11 @@ CHAT.uploadImage = function(formData) {
         type: "post",
         type: "post",
         data: formData,
         data: formData,
         contentType: false,
         contentType: false,
-        processData: false
+        processData: false,
+        error: function () {
+            alert("読み込み失敗");
+            CHAT_UI.dismissLoadingIndicator();
+        }
     }).done(function(res) {
     }).done(function(res) {
         var imgPath = CMS_SERVER_URL + '/chatapi/file/getImage?fileName=' + res.fileName + '&roomId=' + CHAT.globalLoginParameter.roomId;
         var imgPath = CMS_SERVER_URL + '/chatapi/file/getImage?fileName=' + res.fileName + '&roomId=' + CHAT.globalLoginParameter.roomId;
         var imageName = res.fileName
         var imageName = res.fileName