This repository has been archived by the owner on Nov 21, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 370
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: candy.bundle.js candy.bundle.map candy.min.js candy.min.map src/view/pane.js
Conflicts: Gruntfile.js candy.bundle.js candy.bundle.map candy.min.js candy.min.map libs/libs.bundle.js libs/libs.bundle.map libs/libs.min.js src/core/chatUser.js src/view/pane.js
Conflicts: candy.bundle.js candy.bundle.map candy.min.js candy.min.map
Conflicts: candy.bundle.js candy.bundle.map candy.min.js candy.min.map src/view/pane.js
This currently causes a flash with a re-request for the vCard because the user instance is fresh. We should instead try and find the user instance from the "room's" roster, though I'm not sure this is stored for 1-on-1. Conflicts: candy.bundle.js candy.bundle.map candy.min.js candy.min.map
Conflicts: candy.bundle.js candy.bundle.map candy.min.js candy.min.map
// Reset the room's target JID | ||
room.targetJid = bareJid; | ||
|
||
Candy.View.Pane.Roster.update(bareJid, new Candy.Core.ChatUser(bareJid, 'foo'), 'join', Candy.Core.getUser()); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
foo
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Very good question...
What's the status here? |
I'll close this PR, no update has been made. Sorry :) If you want to reopen, please feel free to do so. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rebased version of #272 for @bklang to base his work on.