summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_profile.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-08-06 10:23:04 -0400
committerChristopher Speller <crspeller@gmail.com>2015-08-06 10:23:04 -0400
commit48df0037a244302bdb18efbd20015d936c4462e4 (patch)
tree06eec827ccf7bd6e1df0828085eac159cb83bb4d /web/react/components/user_profile.jsx
parentcc78cc9baced6693d7052a7ff9e9a0e04fbdff5f (diff)
parent331ab2acfc16d5dcfe8ea1be94e5015506b9186b (diff)
downloadchat-48df0037a244302bdb18efbd20015d936c4462e4.tar.gz
chat-48df0037a244302bdb18efbd20015d936c4462e4.tar.bz2
chat-48df0037a244302bdb18efbd20015d936c4462e4.zip
Merge pull request #329 from asaadmahmoodspin/ui-changes
UI Improvements
Diffstat (limited to 'web/react/components/user_profile.jsx')
-rw-r--r--web/react/components/user_profile.jsx3
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/components/user_profile.jsx b/web/react/components/user_profile.jsx
index 65f025919..5c4d26a23 100644
--- a/web/react/components/user_profile.jsx
+++ b/web/react/components/user_profile.jsx
@@ -28,6 +28,7 @@ module.exports = React.createClass({
componentDidMount: function() {
UserStore.addChangeListener(this._onChange);
$("#profile_" + this.uniqueId).popover({placement : 'right', container: 'body', trigger: 'hover', html: true, delay: { "show": 200, "hide": 100 }});
+ $('body').tooltip( {selector: '[data-toggle=tooltip]', trigger: 'hover click'} );
},
componentWillUnmount: function() {
UserStore.removeChangeListener(this._onChange);
@@ -57,7 +58,7 @@ module.exports = React.createClass({
if (!config.ShowEmail) {
data_content += "<div class='text-nowrap'>Email not shared</div>";
} else {
- data_content += "<div><a href='mailto:" + this.state.profile.email + "' class='text-nowrap text-lowercase'>" + this.state.profile.email + "</a></div>";
+ data_content += "<div data-toggle='tooltip' title= '" + this.state.profile.email + "'><a href='mailto:" + this.state.profile.email + "' class='text-nowrap text-lowercase user-popover__email'>" + this.state.profile.email + "</a></div>";
}
return (