diff options
Diffstat (limited to 'web/react/components')
-rw-r--r-- | web/react/components/textbox.jsx | 6 | ||||
-rw-r--r-- | web/react/components/user_settings.jsx | 3 | ||||
-rw-r--r-- | web/react/components/user_settings_general.jsx | 35 |
3 files changed, 40 insertions, 4 deletions
diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx index b4518fe80..ea8126bec 100644 --- a/web/react/components/textbox.jsx +++ b/web/react/components/textbox.jsx @@ -242,7 +242,7 @@ export default class Textbox extends React.Component { const e = React.findDOMNode(this.refs.message); const w = React.findDOMNode(this.refs.wrapper); - let prevHeight = $(e).height(); + const prevHeight = $(e).height(); const lht = parseInt($(e).css('lineHeight'), 10); const lines = e.scrollHeight / lht; @@ -260,7 +260,7 @@ export default class Textbox extends React.Component { $(w).css({height: 'auto'}).height(167); } - if (prevHeight !== $(e).height()) { + if (prevHeight !== $(e).height() && this.props.onHeightChange) { this.props.onHeightChange(); } } @@ -320,6 +320,6 @@ Textbox.propTypes = { messageText: React.PropTypes.string.isRequired, onUserInput: React.PropTypes.func.isRequired, onKeyPress: React.PropTypes.func.isRequired, - onHeightChange: React.PropTypes.func.isRequired, + onHeightChange: React.PropTypes.func, createMessage: React.PropTypes.string.isRequired }; diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx index 282fb7681..2a607b3e0 100644 --- a/web/react/components/user_settings.jsx +++ b/web/react/components/user_settings.jsx @@ -40,6 +40,7 @@ export default class UserSettings extends React.Component { user={this.state.user} activeSection={this.props.activeSection} updateSection={this.props.updateSection} + updateTab={this.props.updateTab} /> </div> ); @@ -86,4 +87,4 @@ UserSettings.propTypes = { activeSection: React.PropTypes.string, updateSection: React.PropTypes.func, updateTab: React.PropTypes.func -};
\ No newline at end of file +}; diff --git a/web/react/components/user_settings_general.jsx b/web/react/components/user_settings_general.jsx index ead7ac1d5..f2127ce0c 100644 --- a/web/react/components/user_settings_general.jsx +++ b/web/react/components/user_settings_general.jsx @@ -267,6 +267,28 @@ export default class UserSettingsGeneralTab extends React.Component { </div> ); + function notifClick(e) { + e.preventDefault(); + this.updateSection(''); + this.props.updateTab('notifications'); + } + + const notifLink = ( + <a + href='#' + onClick={notifClick.bind(this)} + > + Notifications + </a> + ); + + const extraInfo = ( + <span> + By default, you will receive mention notifications when someone types your first name. + Go to {notifLink} settings to change this default. + </span> + ); + nameSection = ( <SettingItemMax title='Full Name' @@ -278,6 +300,7 @@ export default class UserSettingsGeneralTab extends React.Component { this.updateSection(''); e.preventDefault(); }.bind(this)} + extraInfo={extraInfo} /> ); } else { @@ -326,6 +349,13 @@ export default class UserSettingsGeneralTab extends React.Component { </div> ); + const extraInfo = ( + <span> + Use Nickname for a name you might be called that is different from your first name and user name. + This is most often used when two or more people have similar sounding names and usernames. + </span> + ); + nicknameSection = ( <SettingItemMax title='Nickname' @@ -337,6 +367,7 @@ export default class UserSettingsGeneralTab extends React.Component { this.updateSection(''); e.preventDefault(); }.bind(this)} + extraInfo={extraInfo} /> ); } else { @@ -375,6 +406,8 @@ export default class UserSettingsGeneralTab extends React.Component { </div> ); + const extraInfo = (<span>Pick something easy for teammates to recognize and recall.</span>); + usernameSection = ( <SettingItemMax title='Username' @@ -386,6 +419,7 @@ export default class UserSettingsGeneralTab extends React.Component { this.updateSection(''); e.preventDefault(); }.bind(this)} + extraInfo={extraInfo} /> ); } else { @@ -524,5 +558,6 @@ export default class UserSettingsGeneralTab extends React.Component { UserSettingsGeneralTab.propTypes = { user: React.PropTypes.object, updateSection: React.PropTypes.func, + updateTab: React.PropTypes.func, activeSection: React.PropTypes.string }; |