Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
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
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • abookCommunication
  • chat_webview
  • Merge Requests
  • !228

Merged
Opened Aug 06, 2021 by Kim Eunchul@kim-ec 
  • Report abuse
Report abuse

Squash/socket kim ec

  • Discussion 2
  • Commits 6
  • Changes 1
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Aug 06, 2021
    Last updated by Kim Eunchul Aug 06, 2021
    public_new/js/views/chats/chat-room-message.js
    96 96
    97 97 // メッセージ表示
    98 98 let messages = NativeBridgeDataSource.getMessagesByRoomID(roomID);
    99 ChatRoom.prependMessage(messages);
    99 ChatRoom.prependMessage(messages, roomID);
    • Kim Peace @kim-p commented Aug 06, 2021
      Master

      [must] ChatRoom.prependMessage methodのパラメータはmessagesのみなので、roomIDはいらないかと思います。

      [must] `ChatRoom.prependMessage` methodのパラメータはmessagesのみなので、roomIDはいらないかと思います。
    • Kim Eunchul @kim-ec

      changed this line in version 2 of the diff

      Aug 06, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/228/diffs?diff_id=6839&start_sha=38cd925417a0fcec1d1884615fced131df63d0d6#7fd9f59032b3ad23d8caa2ddc511cd93def6c325_99_99)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace
    @kim-p started a discussion on an old version of the diff Aug 06, 2021
    Last updated by Kim Eunchul Aug 06, 2021
    public_new/js/sockets/chat-websocket-message.js
    1 1 CHAT_SOCKET.bindOnNewMessage = function () {
    2 2 // New Message
    3 3 // #36170
    4 socket.on(SOCKET_KEY.NEW_MESSAGE, function (message, roomID, roomName) {
    5 CHAT_SOCKET.handleMessage(message, roomName, SOCKET_KEY.NEW_MESSAGE);
    4 socket.on(SOCKET_KEY.NEW_MESSAGE, function (message, roomID, roomName, onlineUsers) {
    5 CHAT_SOCKET.handleMessage(message, roomName, SOCKET_KEY.NEW_MESSAGE, roomID, onlineUsers);
    6 6 });
    7 7
    8 socket.on(SOCKET_KEY.NEW_COMMUNICATION, function (message, roomID, roomName) {
    9 CHAT_SOCKET.handleMessage(message, roomName, SOCKET_KEY.NEW_COMMUNICATION);
    8 socket.on(SOCKET_KEY.NEW_COMMUNICATION, function (message, roomID, roomName, collaborationType, meetingID) {
    9 CHAT_SOCKET.handleMessage(message, roomName, SOCKET_KEY.NEW_COMMUNICATION, null, null, collaborationType, meetingID);
    • Kim Peace @kim-p commented Aug 06, 2021
      Master

      [ask] roomIDはsocketからもらうので、そのまま渡したらどうですか?

      [ask] `roomID`はsocketからもらうので、そのまま渡したらどうですか?
    • Kim Eunchul @kim-ec

      changed this line in version 2 of the diff

      Aug 06, 2021

      changed this line in version 2 of the diff

      changed this line in [version 2 of the diff](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/228/diffs?diff_id=6839&start_sha=38cd925417a0fcec1d1884615fced131df63d0d6#a8456b6d1e678c4a971851b1ea6238a2229e57e4_9_9)
      Toggle commit list
    Please register or sign in to reply
  • Kim Peace @kim-p

    assigned to @kim-ec

    Aug 06, 2021

    assigned to @kim-ec

    assigned to @kim-ec
    Toggle commit list
  • Kim Eunchul @kim-ec

    added 1 commit

    • b4c29715 - #43695 ウェブソケットの送信方式変更

    Compare with previous version

    Aug 06, 2021

    added 1 commit

    • b4c29715 - #43695 ウェブソケットの送信方式変更

    Compare with previous version

    added 1 commit * b4c29715 - #43695 ウェブソケットの送信方式変更 [Compare with previous version](https://gitlab.agentec.jp/abookCommunication/chat_webview/merge_requests/228/diffs?diff_id=6839&start_sha=38cd925417a0fcec1d1884615fced131df63d0d6)
    Toggle commit list
  • Kim Eunchul @kim-ec

    assigned to @kim-p

    Aug 06, 2021

    assigned to @kim-p

    assigned to @kim-p
    Toggle commit list
  • Kim Peace @kim-p

    merged

    Aug 10, 2021

    merged

    merged
    Toggle commit list
  • Kim Peace @kim-p

    mentioned in commit f1f47181

    Aug 10, 2021

    mentioned in commit f1f47181

    mentioned in commit f1f47181147f89663c7f4e7131b9cc8df0592ba5
    Toggle commit list
  • Write
  • Preview
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 sign in to comment
Kim Peace
Assignee
Kim Peace @kim-p
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: abookCommunication/chat_webview!228
×

Revert this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.