Merge pull request #350 from nickago/MM-1684
MM-1684 Refactored code to remove errors on startup
Этот коммит содержится в:
@@ -439,7 +439,7 @@ module.exports = React.createClass({
|
||||
currentPostDay = utils.getDateForUnixTicks(post.create_at);
|
||||
if (currentPostDay.toDateString() != previousPostDay.toDateString()) {
|
||||
postCtls.push(
|
||||
<div className="date-separator">
|
||||
<div key={currentPostDay.toDateString()} className="date-separator">
|
||||
<hr className="separator__hr" />
|
||||
<div className="separator__text">{currentPostDay.toDateString()}</div>
|
||||
</div>
|
||||
@@ -449,7 +449,7 @@ module.exports = React.createClass({
|
||||
if (post.create_at > last_viewed && !rendered_last_viewed) {
|
||||
rendered_last_viewed = true;
|
||||
postCtls.push(
|
||||
<div className="new-separator">
|
||||
<div key="unviewed" className="new-separator">
|
||||
<hr id="new_message" className="separator__hr" />
|
||||
<div className="separator__text">New Messages</div>
|
||||
</div>
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
var utils = require('../utils/utils.jsx');
|
||||
|
||||
module.exports = React.createClass({
|
||||
displayName:'SettingsSidebar',
|
||||
updateTab: function(tab) {
|
||||
this.props.updateTab(tab);
|
||||
$('.settings-modal').addClass('display--content');
|
||||
@@ -14,7 +15,7 @@ module.exports = React.createClass({
|
||||
<div className="">
|
||||
<ul className="nav nav-pills nav-stacked">
|
||||
{this.props.tabs.map(function(tab) {
|
||||
return <li className={self.props.activeTab == tab.name ? 'active' : ''}><a href="#" onClick={function(){self.updateTab(tab.name);}}><i className={tab.icon}></i>{tab.ui_name}</a></li>
|
||||
return <li key={tab.name+'_li'} className={self.props.activeTab == tab.name ? 'active' : ''}><a key={tab.name + '_a'} href="#" onClick={function(){self.updateTab(tab.name);}}><i key={tab.name+'_i'} className={tab.icon}></i>{tab.ui_name}</a></li>
|
||||
})}
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@@ -87,7 +87,7 @@ var NavbarDropdown = React.createClass({
|
||||
}
|
||||
});
|
||||
}
|
||||
teams.push(<li><a href={utils.getWindowLocationOrigin() + '/signup_team'}>Create a New Team</a></li>);
|
||||
teams.push(<li key='newTeam_li'><a key='newTeam_a' href={utils.getWindowLocationOrigin() + '/signup_team' }>Create a New Team</a></li>);
|
||||
|
||||
return (
|
||||
<ul className='nav navbar-nav navbar-right'>
|
||||
|
||||
Ссылка в новой задаче
Block a user