Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
chat_webview
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abookCommunication
chat_webview
Commits
a2f34c2e
Commit
a2f34c2e
authored
May 27, 2021
by
Lee Munkyeong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
コードレビュー対応及び動画エンコード失敗の処理追加。
parent
62fbf72b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
14 deletions
+18
-14
public_new/js/chat-ui.js
+11
-11
public_new/js/language_en.js
+2
-1
public_new/js/language_ja.js
+3
-1
public_new/js/language_ko.js
+2
-1
No files found.
public_new/js/chat-ui.js
View file @
a2f34c2e
...
@@ -846,30 +846,31 @@ var GetFileObjectFromURL = function(filePathOrUrl, convertBlob) {
...
@@ -846,30 +846,31 @@ var GetFileObjectFromURL = function(filePathOrUrl, convertBlob) {
});
});
};
};
CHAT_UI
.
videoEncodeFail
=
function
()
{
alert
(
getLocalizedString
(
'error_send_video'
));
CHAT_UI
.
dismissLoadingIndicator
();
}
CHAT_UI
.
videoEncodeEnd
=
function
(
encodedUri
)
{
CHAT_UI
.
videoEncodeEnd
=
function
(
encodedUri
)
{
console
.
log
(
'encode end'
);
console
.
log
(
'file:'
+
encodedUri
);
var
fileName
=
encodedUri
.
split
(
'/'
)[
encodedUri
.
split
(
'/'
).
length
-
1
];
var
fileName
=
encodedUri
.
split
(
'/'
)[
encodedUri
.
split
(
'/'
).
length
-
1
];
//var testFile = new File(decodeURI('file://'+encodedUri));
var
fileURL
=
'file:'
+
encodedUri
;
var
FileURL
=
'file:'
+
encodedUri
;
var
xhr
=
new
XMLHttpRequest
();
var
xhr
=
new
XMLHttpRequest
();
xhr
.
open
(
"GET"
,
F
ileURL
);
xhr
.
open
(
"GET"
,
f
ileURL
);
xhr
.
responseType
=
"blob"
;
xhr
.
responseType
=
"blob"
;
xhr
.
addEventListener
(
'load'
,
function
()
{
xhr
.
addEventListener
(
'load'
,
function
()
{
console
.
log
(
xhr
.
response
);
var
formData
=
new
FormData
();
var
formData
=
new
FormData
();
formData
.
append
(
"image"
,
xhr
.
response
,
fileName
);
formData
.
append
(
"image"
,
xhr
.
response
,
fileName
);
formData
.
append
(
'sid'
,
CHAT
.
globalLoginParameter
.
sid
);
formData
.
append
(
'sid'
,
CHAT
.
globalLoginParameter
.
sid
);
formData
.
append
(
'roomId'
,
CHAT
.
globalLoginParameter
.
roomId
);
formData
.
append
(
'roomId'
,
CHAT
.
globalLoginParameter
.
roomId
);
jQuery
.
ajax
({
jQuery
.
ajax
({
async
:
true
,
async
:
true
,
url
:
CMS_SERVER_URL
+
"/chatapi/file/upload"
,
url
:
CMS_SERVER_URL
+
"/chatapi/file/upload"
,
type
:
"post"
,
type
:
"post"
,
data
:
formData
,
data
:
formData
,
contentType
:
false
,
contentType
:
false
,
processData
:
false
,
processData
:
false
,
error
:
function
()
{
error
:
function
()
{
alert
(
"読み込み失敗"
);
alert
(
getLocalizedString
(
'error_send_video'
)
);
CHAT_UI
.
dismissLoadingIndicator
();
CHAT_UI
.
dismissLoadingIndicator
();
}
}
}).
done
(
function
(
res
)
{
}).
done
(
function
(
res
)
{
...
@@ -905,7 +906,6 @@ CHAT_UI.videoEncodeEnd = function(encodedUri) {
...
@@ -905,7 +906,6 @@ CHAT_UI.videoEncodeEnd = function(encodedUri) {
text
:
encodedText
+
messageSeperator
+
messageType
.
VIDEO
text
:
encodedText
+
messageSeperator
+
messageType
.
VIDEO
},
1
);
},
1
);
$
(
'.overlay'
).
removeClass
(
'active undismissable'
);
$
(
'.overlay'
).
removeClass
(
'active undismissable'
);
$
(
'.loader'
).
removeClass
(
'active'
);
$
(
'.loader'
).
removeClass
(
'active'
);
CHAT_UI
.
dismissLoadingIndicator
();
CHAT_UI
.
dismissLoadingIndicator
();
...
...
public_new/js/language_en.js
View file @
a2f34c2e
...
@@ -99,5 +99,6 @@ $.lang.en = {
...
@@ -99,5 +99,6 @@ $.lang.en = {
"not_support_version"
:
"did not support this device version."
,
"not_support_version"
:
"did not support this device version."
,
"err_target_android_version_not_support"
:
"did not support document collaboration on this user's device version."
,
"err_target_android_version_not_support"
:
"did not support document collaboration on this user's device version."
,
"err_not_exist_room"
:
"this room is not exist."
,
"err_not_exist_room"
:
"this room is not exist."
,
"norify_request_host_change"
:
"%@ request host permission
\
ndo you want to approve?"
"norify_request_host_change"
:
"%@ request host permission
\
ndo you want to approve?"
,
"error_send_video"
:
"Fail to send."
}
}
public_new/js/language_ja.js
View file @
a2f34c2e
...
@@ -99,5 +99,6 @@ $.lang.ja = {
...
@@ -99,5 +99,6 @@ $.lang.ja = {
"not_support_version"
:
"現在の端末バージョンでは利用できません。"
,
"not_support_version"
:
"現在の端末バージョンでは利用できません。"
,
"err_target_android_version_not_support"
:
"対象ユーザの端末バージョンでは文書協業が利用できません。"
,
"err_target_android_version_not_support"
:
"対象ユーザの端末バージョンでは文書協業が利用できません。"
,
"err_not_exist_room"
:
"該当のルームが存在しません。"
,
"err_not_exist_room"
:
"該当のルームが存在しません。"
,
"norify_request_host_change"
:
"%@様からホスト変更リクエストがあります。
\
n承認しますか?"
"norify_request_host_change"
:
"%@様からホスト変更リクエストがあります。
\
n承認しますか?"
,
"error_send_video"
:
"送信に失敗しました。"
}
}
\ No newline at end of file
public_new/js/language_ko.js
View file @
a2f34c2e
...
@@ -99,5 +99,6 @@ $.lang.ko = {
...
@@ -99,5 +99,6 @@ $.lang.ko = {
"not_support_version"
:
"현재단말버전에서는 지원되지않는기능입니다."
,
"not_support_version"
:
"현재단말버전에서는 지원되지않는기능입니다."
,
"err_target_android_version_not_support"
:
"해당 유저의 단말버전에서는 문서협업이 이용불가능합니다."
,
"err_target_android_version_not_support"
:
"해당 유저의 단말버전에서는 문서협업이 이용불가능합니다."
,
"err_not_exist_room"
:
"해당 룸이 존재하지않습니다."
,
"err_not_exist_room"
:
"해당 룸이 존재하지않습니다."
,
"norify_request_host_change"
:
"%@님이 호스트변경을 요청하셨습니다.
\
n승인하시겠습니까?"
"norify_request_host_change"
:
"%@님이 호스트변경을 요청하셨습니다.
\
n승인하시겠습니까?"
,
"error_send_video"
:
"전송에 실패했습니다."
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment