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
862e02b5
Commit
862e02b5
authored
Apr 16, 2021
by
Takatoshi Miura
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
js連携
parent
4aee10e4
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
2 deletions
+14
-2
public_new/js/chat-ui.js
+14
-2
No files found.
public_new/js/chat-ui.js
View file @
862e02b5
...
@@ -784,7 +784,11 @@ CHAT_UI.showConfirmView = function(isInvite) {
...
@@ -784,7 +784,11 @@ CHAT_UI.showConfirmView = function(isInvite) {
// ルーム名のtrimmingした後、URIencodingを行う
// ルーム名のtrimmingした後、URIencodingを行う
const
encodedRoomName
=
encodeURIComponent
(
trimmedRoomName
);
const
encodedRoomName
=
encodeURIComponent
(
trimmedRoomName
);
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
createChatRoom
(
"1"
,
userIdList
.
join
(
','
),
encodedRoomName
);
android
.
createChatRoom
(
"1"
,
userIdList
.
join
(
','
),
encodedRoomName
);
}
else
{
webkit
.
messageHandlers
.
createChatRoom
.
postMessage
({
"roomType"
:
"1"
,
"userIdList"
:
userIdList
.
join
(
','
),
"roomName"
:
encodedRoomName
});
}
}
}
}
}
...
@@ -1317,7 +1321,7 @@ $('#makeRoomConfirmBtn').on('click', function(e) {
...
@@ -1317,7 +1321,7 @@ $('#makeRoomConfirmBtn').on('click', function(e) {
android
.
saveSelectedUserList
(
CHAT
.
globalSelectedUserList
.
join
(
","
));
android
.
saveSelectedUserList
(
CHAT
.
globalSelectedUserList
.
join
(
","
));
}
else
{
}
else
{
var
userList
=
CHAT
.
globalSelectedUserList
.
join
(
","
);
var
userList
=
CHAT
.
globalSelectedUserList
.
join
(
","
);
webkit
.
messageHandlers
.
saveSelectedUserList
.
postMessage
(
{
userList
}
);
webkit
.
messageHandlers
.
saveSelectedUserList
.
postMessage
(
userList
);
}
}
$
(
'#makeRoomForm'
).
submit
();
$
(
'#makeRoomForm'
).
submit
();
});
});
...
@@ -1327,7 +1331,7 @@ $('#addUserConfirmBtn').on('click', function(e) {
...
@@ -1327,7 +1331,7 @@ $('#addUserConfirmBtn').on('click', function(e) {
android
.
saveSelectedUserList
(
CHAT
.
globalSelectedUserList
.
join
(
","
));
android
.
saveSelectedUserList
(
CHAT
.
globalSelectedUserList
.
join
(
","
));
}
else
{
}
else
{
var
userList
=
CHAT
.
globalSelectedUserList
.
join
(
","
);
var
userList
=
CHAT
.
globalSelectedUserList
.
join
(
","
);
webkit
.
messageHandlers
.
saveSelectedUserList
.
postMessage
(
{
userList
}
);
webkit
.
messageHandlers
.
saveSelectedUserList
.
postMessage
(
userList
);
}
}
$
(
'#addUserForm'
).
submit
();
$
(
'#addUserForm'
).
submit
();
});
});
...
@@ -2011,7 +2015,11 @@ CHAT_UI.showMakeRoomConfirmView = function() {
...
@@ -2011,7 +2015,11 @@ CHAT_UI.showMakeRoomConfirmView = function() {
// 参加ユーザ名でルーム名を生成
// 参加ユーザ名でルーム名を生成
let
newRoomName
=
CHAT
.
globalLoginParameter
.
loginId
+
','
+
userNameList
.
join
(
','
);
let
newRoomName
=
CHAT
.
globalLoginParameter
.
loginId
+
','
+
userNameList
.
join
(
','
);
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
createChatRoom
(
"1"
,
userIdList
.
join
(
','
),
newRoomName
);
android
.
createChatRoom
(
"1"
,
userIdList
.
join
(
','
),
newRoomName
);
}
else
{
webkit
.
messageHandlers
.
createChatRoom
.
postMessage
({
"roomType"
:
"1"
,
"userIdList"
:
userIdList
.
join
(
','
),
"roomName"
:
newRoomName
});
}
}
else
if
(
trimmedRoomName
.
includes
(
';'
)
||
trimmedRoomName
.
includes
(
'/'
)
||
trimmedRoomName
.
includes
(
'?'
)
||
trimmedRoomName
.
includes
(
':'
)
||
trimmedRoomName
.
includes
(
"@"
)
}
else
if
(
trimmedRoomName
.
includes
(
';'
)
||
trimmedRoomName
.
includes
(
'/'
)
||
trimmedRoomName
.
includes
(
'?'
)
||
trimmedRoomName
.
includes
(
':'
)
||
trimmedRoomName
.
includes
(
"@"
)
||
trimmedRoomName
.
includes
(
'&'
)
||
trimmedRoomName
.
includes
(
'='
)
||
trimmedRoomName
.
includes
(
"+"
)
||
trimmedRoomName
.
includes
(
'$'
)
||
trimmedRoomName
.
includes
(
","
)
||
trimmedRoomName
.
includes
(
'-'
)
||
trimmedRoomName
.
includes
(
'&'
)
||
trimmedRoomName
.
includes
(
'='
)
||
trimmedRoomName
.
includes
(
"+"
)
||
trimmedRoomName
.
includes
(
'$'
)
||
trimmedRoomName
.
includes
(
","
)
||
trimmedRoomName
.
includes
(
'-'
)
...
@@ -2055,7 +2063,11 @@ CHAT_UI.showMakeRoomConfirmView = function() {
...
@@ -2055,7 +2063,11 @@ CHAT_UI.showMakeRoomConfirmView = function() {
// ルーム名のtrimmingした後、URIencodingを行う
// ルーム名のtrimmingした後、URIencodingを行う
const
encodedRoomName
=
encodeURIComponent
(
trimmedRoomName
);
const
encodedRoomName
=
encodeURIComponent
(
trimmedRoomName
);
if
(
typeof
(
android
)
!=
"undefined"
)
{
android
.
createChatRoom
(
"1"
,
userIdList
.
join
(
','
),
encodedRoomName
);
android
.
createChatRoom
(
"1"
,
userIdList
.
join
(
','
),
encodedRoomName
);
}
else
{
webkit
.
messageHandlers
.
createChatRoom
.
postMessage
({
"roomType"
:
"1"
,
"userIdList"
:
userIdList
.
join
(
','
),
"roomName"
:
encodedRoomName
});
}
}
}
});
});
...
...
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