Skip to content
This repository has been archived by the owner on Nov 21, 2024. It is now read-only.

Profile pane #309

Closed
wants to merge 6 commits into from
Closed

Profile pane #309

wants to merge 6 commits into from

Conversation

benlangfeld
Copy link
Member

Rebased version of #272 for @bklang to base his work on.

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
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.32%) when pulling bbf0682 on feature/profile-pane into 78f1ef1 on dev.

// 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());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

foo?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very good question...

@mweibel
Copy link
Member

mweibel commented Jan 14, 2015

What's the status here?

@mweibel
Copy link
Member

mweibel commented Feb 26, 2015

I'll close this PR, no update has been made. Sorry :) If you want to reopen, please feel free to do so.

@mweibel mweibel closed this Feb 26, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants