Commit 72afa06e by Kim Peace

Merge branch 'feature/host_change' into debug/console_logs

# Conflicts:
#	public_new/js/views/collaboration/fermi-web-socket-message-handler.js
parents d05043cb 9b00fd4c
......@@ -51,6 +51,16 @@ CollaborationUI.bindDisplayUsersButton = function () {
});
};
CollaborationUI.userListSlideOut = function () {
const w = $(".user_btn").width();
$(".user_btn").removeClass("hide");
$("#overlay_user_list.overlay")
.removeClass("slidein")
.css({ transform: "translateX(" & -w & ")" });
scrollTo(0, 0);
CollaborationUI.bindDisableScroll();
};
CollaborationUI.bindChangeHostButton = function () {
$(".ch_host_btn").click(function () {
const target = $(this).val();
......
......@@ -58,7 +58,7 @@ FermiWebSocketMessageHandler.handleMessagesToSelf = function (data) {
// 自分自身の場合
switch (data.type) {
case "HOST_CHANGE_REQUEST":
FermiWebSocketMessageHandler.hostChangeRequest();
FermiWebSocketMessageHandler.hostChangeRequest(data);
break;
case "PIP_END_REQUEST":
if (globalUserInfo.collaborationType == COLLABORATION_TYPE.DOCUMENT) {
......@@ -200,9 +200,9 @@ FermiWebSocketMessageHandler.captureRequest = function (data) {
};
// HOST_CHANGE_REQUEST
FermiWebSocketMessageHandler.hostChangeRequest = function () {
FermiWebSocketMessageHandler.hostChangeRequest = function (data) {
console.log("peacekim:: FermiWebSocketMessageHandler.hostChangeRequest");
FermiWebSocketBridge.requestHostChange();
FermiWebSocketBridge.hostChangeResponse(data);
};
// HOST_CHANGE_RESPONSE
......
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