Added update function to image update and fixed corner cases

Этот коммит содержится в:
nickago
2015-07-13 09:22:42 -07:00
родитель f5d188e1ca
Коммит c485dad84f
6 изменённых файлов: 12 добавлений и 7 удалений

Просмотреть файл

@@ -23,6 +23,7 @@ module.exports = React.createClass({
var member = this.props.member; var member = this.props.member;
var isAdmin = this.props.isAdmin; var isAdmin = this.props.isAdmin;
var isMemberAdmin = member.roles.indexOf("admin") > -1; var isMemberAdmin = member.roles.indexOf("admin") > -1;
var timestamp = UserStore.getCurrentUser().update_at;
var invite; var invite;
if (member.invited && this.props.handleInvite) { if (member.invited && this.props.handleInvite) {
@@ -53,7 +54,7 @@ module.exports = React.createClass({
return ( return (
<div className="row member-div"> <div className="row member-div">
<img className="post-profile-img pull-left" src={"/api/v1/users/" + member.id + "/image"} height="36" width="36" /> <img className="post-profile-img pull-left" src={"/api/v1/users/" + member.id + "/image?time=" + timestamp} height="36" width="36" />
<span className="member-name">{member.username}</span> <span className="member-name">{member.username}</span>
<span className="member-email">{member.email}</span> <span className="member-email">{member.email}</span>
{ invite } { invite }

Просмотреть файл

@@ -61,7 +61,8 @@ var MemberListTeamItem = React.createClass({
render: function() { render: function() {
var server_error = this.state.server_error ? <div style={{ clear: "both" }} className="has-error"><label className='has-error control-label'>{this.state.server_error}</label></div> : null; var server_error = this.state.server_error ? <div style={{ clear: "both" }} className="has-error"><label className='has-error control-label'>{this.state.server_error}</label></div> : null;
var user = this.props.user; var user = this.props.user;
var currentRoles = "Member" var currentRoles = "Member";
var timestamp = UserStore.getCurrentUser().update_at;
if (user.roles.length > 0) { if (user.roles.length > 0) {
currentRoles = user.roles.charAt(0).toUpperCase() + user.roles.slice(1); currentRoles = user.roles.charAt(0).toUpperCase() + user.roles.slice(1);
@@ -83,7 +84,7 @@ var MemberListTeamItem = React.createClass({
return ( return (
<div className="row member-div"> <div className="row member-div">
<img className="post-profile-img pull-left" src={"/api/v1/users/" + user.id + "/image"} height="36" width="36" /> <img className="post-profile-img pull-left" src={"/api/v1/users/" + user.id + "/image?time=" + timestamp} height="36" width="36" />
<span className="member-name">{user.full_name.trim() ? user.full_name : user.username}</span> <span className="member-name">{user.full_name.trim() ? user.full_name : user.username}</span>
<span className="member-email">{user.full_name.trim() ? user.username : email}</span> <span className="member-email">{user.full_name.trim() ? user.username : email}</span>
<div className="dropdown member-drop"> <div className="dropdown member-drop">

Просмотреть файл

@@ -1,5 +1,6 @@
// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
// See License.txt for license information. // See License.txt for license information.
var UserStore = require("../stores/user_store.jsx");
module.exports = React.createClass({ module.exports = React.createClass({
handleClick: function() { handleClick: function() {
@@ -7,8 +8,9 @@ module.exports = React.createClass({
}, },
render: function() { render: function() {
var icon; var icon;
var timestamp = UserStore.getCurrentUser().update_at;
if (this.props.id != null) { if (this.props.id != null) {
icon = <span><img className="mention-img" src={"/api/v1/users/" + this.props.id + "/image"}/></span>; icon = <span><img className="mention-img" src={"/api/v1/users/" + this.props.id + "/image?time=" + timestamp}/></span>;
} else { } else {
icon = <span><i className="mention-img fa fa-users fa-2x"></i></span>; icon = <span><i className="mention-img fa fa-users fa-2x"></i></span>;
} }

Просмотреть файл

@@ -228,11 +228,12 @@ CommentPost = React.createClass({
} }
var message = utils.textToJsx(this.props.post.message); var message = utils.textToJsx(this.props.post.message);
var timestamp = UserStore.getCurrentUser().update_at;
return ( return (
<div className={commentClass + " " + currentUserCss}> <div className={commentClass + " " + currentUserCss}>
<div className="post-profile-img__container"> <div className="post-profile-img__container">
<img className="post-profile-img" src={"/api/v1/users/" + this.props.post.user_id + "/image"} height="36" width="36" /> <img className="post-profile-img" src={"/api/v1/users/" + this.props.post.user_id + "/image?time=" + timestamp} height="36" width="36" />
</div> </div>
<div className="post__content"> <div className="post__content">
<ul className="post-header"> <ul className="post-header">

Просмотреть файл

@@ -76,6 +76,7 @@ SearchItem = React.createClass({
var message = utils.textToJsx(this.props.post.message, {searchTerm: this.props.term, noMentionHighlight: !this.props.isMentionSearch}); var message = utils.textToJsx(this.props.post.message, {searchTerm: this.props.term, noMentionHighlight: !this.props.isMentionSearch});
var channelName = ""; var channelName = "";
var channel = ChannelStore.get(this.props.post.channel_id) var channel = ChannelStore.get(this.props.post.channel_id)
var timestamp = UserStore.getCurrentUser().update_at;
if (channel) { if (channel) {
if (channel.type === 'D') { if (channel.type === 'D') {
@@ -89,7 +90,7 @@ SearchItem = React.createClass({
<div className="search-item-container post" onClick={this.handleClick}> <div className="search-item-container post" onClick={this.handleClick}>
<div className="search-channel__name">{ channelName }</div> <div className="search-channel__name">{ channelName }</div>
<div className="post-profile-img__container"> <div className="post-profile-img__container">
<img className="post-profile-img" src={"/api/v1/users/" + this.props.post.user_id + "/image"} height="36" width="36" /> <img className="post-profile-img" src={"/api/v1/users/" + this.props.post.user_id + "/image?time=" + timestamp} height="36" width="36" />
</div> </div>
<div className="post__content"> <div className="post__content">
<ul className="post-header"> <ul className="post-header">

Просмотреть файл

@@ -707,7 +707,6 @@ module.exports.switchChannel = function(channel, teammate_name) {
AsyncClient.getChannels(true, true, true); AsyncClient.getChannels(true, true, true);
AsyncClient.getChannelExtraInfo(true); AsyncClient.getChannelExtraInfo(true);
AsyncClient.getPosts(true, channel.id); AsyncClient.getPosts(true, channel.id);
AsyncClient.getProfiles();
$('.inner__wrap').removeClass('move--right'); $('.inner__wrap').removeClass('move--right');
$('.sidebar--left').removeClass('move--right'); $('.sidebar--left').removeClass('move--right');