Skip to content

C
chat_webview
Commit 9cdbfe65 by Kim Peace
Options

Fixed Const name case

parent 0878e0dc
Showing with 26 additions and 26 deletions
public_new/chat.html
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
IS_MOBILE = isMobile; IS_MOBILE = isMobile;
IS_ONLINE = isOnline; IS_ONLINE = isOnline;
console.log("onChat"); console.log("onChat");
CHAT_UI.refreshRoomList(chatRoomType.GROUP); CHAT_UI.refreshRoomList(ChatRoomType.GROUP);
CHAT_UI.dismissLoadingIndicator(); CHAT_UI.dismissLoadingIndicator();
}; };
</script> </script>
......
public_new/collaboration.html
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
roomType = CHAT_DB.getRoomType(); roomType = CHAT_DB.getRoomType();
} }
if (roomType == chatRoomType.DM) { if (roomType == ChatRoomType.DM) {
$('.add_user_btn').removeClass('none'); $('.add_user_btn').removeClass('none');
} }
......
public_new/collaboration_documents.html
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
collaborationJoinFlg = android.getCollaborationJoinFlg(); collaborationJoinFlg = android.getCollaborationJoinFlg();
} }
globalUserInfo.coWorkType = collaborationTypeKey.DOCUMENT; globalUserInfo.coWorkType = CollaborationTypeKey.DOCUMENT;
CHAT_SOCKET.connectSocket(); CHAT_SOCKET.connectSocket();
socket.emit('join', CHAT.globalLoginParameter, function() { socket.emit('join', CHAT.globalLoginParameter, function() {
}); });
......
public_new/collaboration_picture.html
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
roomType = CHAT_DB.getRoomType(); roomType = CHAT_DB.getRoomType();
} }
if (roomType == chatRoomType.DM) { if (roomType == ChatRoomType.DM) {
$('.add_user_btn').removeClass('none'); $('.add_user_btn').removeClass('none');
} }
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
collaborationJoinFlg = android.getCollaborationJoinFlg(); collaborationJoinFlg = android.getCollaborationJoinFlg();
console.log(collaborationJoinFlg); console.log(collaborationJoinFlg);
} }
globalUserInfo.coWorkType = collaborationTypeKey.CAMERA; globalUserInfo.coWorkType = CollaborationTypeKey.CAMERA;
if (collaborationJoinFlg != '2') { if (collaborationJoinFlg != '2') {
CHAT_SOCKET.connectSocket(); CHAT_SOCKET.connectSocket();
socket.emit('join', CHAT.globalLoginParameter, function() { socket.emit('join', CHAT.globalLoginParameter, function() {
......
public_new/collaboration_video.html
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
roomType = CHAT_DB.getRoomType(); roomType = CHAT_DB.getRoomType();
} }
if (roomType == chatRoomType.DM) { if (roomType == ChatRoomType.DM) {
$('.add_user_btn').removeClass('none'); $('.add_user_btn').removeClass('none');
} }
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
collaborationJoinFlg = android.getCollaborationJoinFlg(); collaborationJoinFlg = android.getCollaborationJoinFlg();
console.log(collaborationJoinFlg); console.log(collaborationJoinFlg);
} }
globalUserInfo.coWorkType = collaborationTypeKey.VIDEO; globalUserInfo.coWorkType = CollaborationTypeKey.VIDEO;
if (collaborationJoinFlg != '2') { if (collaborationJoinFlg != '2') {
CHAT_SOCKET.connectSocket(); CHAT_SOCKET.connectSocket();
socket.emit('join', CHAT.globalLoginParameter, function() { socket.emit('join', CHAT.globalLoginParameter, function() {
......
public_new/collaboration_voice.html
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
roomType = CHAT_DB.getRoomType(); roomType = CHAT_DB.getRoomType();
} }
if (roomType == chatRoomType.DM) { if (roomType == ChatRoomType.DM) {
$('.add_user_btn').removeClass('none'); $('.add_user_btn').removeClass('none');
} }
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
collaborationJoinFlg = android.getCollaborationJoinFlg(); collaborationJoinFlg = android.getCollaborationJoinFlg();
console.log(collaborationJoinFlg); console.log(collaborationJoinFlg);
} }
globalUserInfo.coWorkType = collaborationTypeKey.AUDIO; globalUserInfo.coWorkType = CollaborationTypeKey.AUDIO;
if (collaborationJoinFlg != '2') { if (collaborationJoinFlg != '2') {
CHAT_SOCKET.connectSocket(); CHAT_SOCKET.connectSocket();
socket.emit('join', CHAT.globalLoginParameter, function() { socket.emit('join', CHAT.globalLoginParameter, function() {
......
public_new/collaboration_whiteboard.html
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
roomType = CHAT_DB.getRoomType(); roomType = CHAT_DB.getRoomType();
} }
if (roomType == chatRoomType.DM) { if (roomType == ChatRoomType.DM) {
$('.add_user_btn').removeClass('none'); $('.add_user_btn').removeClass('none');
} }
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
} else if (CHAT_UTIL.isAndroid()) { } else if (CHAT_UTIL.isAndroid()) {
collaborationJoinFlg = android.getCollaborationJoinFlg(); collaborationJoinFlg = android.getCollaborationJoinFlg();
} }
globalUserInfo.coWorkType = collaborationTypeKey.BOARD; globalUserInfo.coWorkType = CollaborationTypeKey.BOARD;
if (collaborationJoinFlg != '2') { if (collaborationJoinFlg != '2') {
CHAT_SOCKET.connectSocket(); CHAT_SOCKET.connectSocket();
socket.emit('join', CHAT.globalLoginParameter, function() { socket.emit('join', CHAT.globalLoginParameter, function() {
......
public_new/js/chat-ui.js
This source diff could not be displayed because it is too large. You can view the blob instead.
public_new/js/chat-websocket.js
...@@ -217,14 +217,14 @@ function setSocketAction() { ...@@ -217,14 +217,14 @@ function setSocketAction() {
message.text = text[0]; message.text = text[0];
type = text[1]; type = text[1];
if ( if (
type == messageType.COMMUNICATIONSTART || type == MessageType.COMMUNICATIONSTART ||
type == messageType.COMMUNICATIONEND type == MessageType.COMMUNICATIONEND
) { ) {
collaborationType = text[2]; collaborationType = text[2];
var meetingId = 0; var meetingId = 0;
if ( if (
collaborationType == collaborationType ==
CHAT_UTIL.getCollaborationType(collaborationTypeKey.DOCUMENT) CHAT_UTIL.getCollaborationType(CollaborationTypeKey.DOCUMENT)
) { ) {
meetingId = text[3]; meetingId = text[3];
} }
...@@ -494,7 +494,7 @@ function setSocketAction() { ...@@ -494,7 +494,7 @@ function setSocketAction() {
} else { } else {
if (IS_ONLINE == "true") { if (IS_ONLINE == "true") {
android.updateRoomList(); android.updateRoomList();
CHAT_UI.refreshRoomList(chatRoomType.DM); CHAT_UI.refreshRoomList(ChatRoomType.DM);
CHAT_UI.dismissLoadingIndicator(); CHAT_UI.dismissLoadingIndicator();
} }
} }
......
public_new/js/share.js
...@@ -225,10 +225,10 @@ document.addEventListener('DOMContentLoaded', function() { ...@@ -225,10 +225,10 @@ document.addEventListener('DOMContentLoaded', function() {
} }
} else if (data.type === "CHANGE_HOST_APPLY") { } else if (data.type === "CHANGE_HOST_APPLY") {
if (CHAT_UTIL.isAndroid()) { if (CHAT_UTIL.isAndroid()) {
android.setHostRequestFlg(HOST_REQUEST_FLG.DOING); android.setHostRequestFlg(HostRequestFlag.DOING);
} else { } else {
webkit.messageHandlers.setHostRequestFlg.postMessage( webkit.messageHandlers.setHostRequestFlg.postMessage(
HOST_REQUEST_FLG.DOING HostRequestFlag.DOING
); );
} }
if (g_isMainMan) { if (g_isMainMan) {
...@@ -242,10 +242,10 @@ document.addEventListener('DOMContentLoaded', function() { ...@@ -242,10 +242,10 @@ document.addEventListener('DOMContentLoaded', function() {
) { ) {
Coview_changeHost(getFermiLoginId(data.payload.hostId)); Coview_changeHost(getFermiLoginId(data.payload.hostId));
if (CHAT_UTIL.isAndroid()) { if (CHAT_UTIL.isAndroid()) {
android.setHostRequestFlg(HOST_REQUEST_FLG.DONE); android.setHostRequestFlg(HostRequestFlag.DONE);
} else { } else {
webkit.messageHandlers.setHostRequestFlg.postMessage( webkit.messageHandlers.setHostRequestFlg.postMessage(
HOST_REQUEST_FLG.DONE HostRequestFlag.DONE
); );
} }
} else { } else {
...@@ -259,10 +259,10 @@ document.addEventListener('DOMContentLoaded', function() { ...@@ -259,10 +259,10 @@ document.addEventListener('DOMContentLoaded', function() {
} }
} else if (data.type === "HOST_REQUEST_DONE") { } else if (data.type === "HOST_REQUEST_DONE") {
if (CHAT_UTIL.isAndroid()) { if (CHAT_UTIL.isAndroid()) {
android.setHostRequestFlg(HOST_REQUEST_FLG.DONE); android.setHostRequestFlg(HostRequestFlag.DONE);
} else { } else {
webkit.messageHandlers.setHostRequestFlg.postMessage( webkit.messageHandlers.setHostRequestFlg.postMessage(
HOST_REQUEST_FLG.DONE HostRequestFlag.DONE
); );
} }
} else if (data.type === "HOST_REQUEST_REJECT") { } else if (data.type === "HOST_REQUEST_REJECT") {
...@@ -270,10 +270,10 @@ document.addEventListener('DOMContentLoaded', function() { ...@@ -270,10 +270,10 @@ document.addEventListener('DOMContentLoaded', function() {
alert("REJECT for owner user"); alert("REJECT for owner user");
} }
if (CHAT_UTIL.isAndroid()) { if (CHAT_UTIL.isAndroid()) {
android.setHostRequestFlg(HOST_REQUEST_FLG.DONE); android.setHostRequestFlg(HostRequestFlag.DONE);
} else { } else {
webkit.messageHandlers.setHostRequestFlg.postMessage( webkit.messageHandlers.setHostRequestFlg.postMessage(
HOST_REQUEST_FLG.DONE HostRequestFlag.DONE
); );
} }
} }
...@@ -716,15 +716,15 @@ function applyForHostChange() { ...@@ -716,15 +716,15 @@ function applyForHostChange() {
} else { } else {
hostRequestFlg = CHAT_DB.getHostRequestFlg(); hostRequestFlg = CHAT_DB.getHostRequestFlg();
} }
if (hostRequestFlg == HOST_REQUEST_FLG.DOING) { if (hostRequestFlg == HostRequestFlag.DOING) {
alert(getLocalizedString("already_processing_host_request")); alert(getLocalizedString("already_processing_host_request"));
return; return;
} }
if (CHAT_UTIL.isAndroid()) { if (CHAT_UTIL.isAndroid()) {
android.setHostRequestFlg(HOST_REQUEST_FLG.DOING); android.setHostRequestFlg(HostRequestFlag.DOING);
} else { } else {
webkit.messageHandlers.setHostRequestFlg.postMessage( webkit.messageHandlers.setHostRequestFlg.postMessage(
HOST_REQUEST_FLG.DOING HostRequestFlag.DOING
); );
} }
fw.sendToMsg("others", "CHANGE_HOST_APPLY", { fw.sendToMsg("others", "CHANGE_HOST_APPLY", {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment