From a11e49281b7c99a5f124ae8580a07e65f28037cd Mon Sep 17 00:00:00 2001
From: Cameron Dawson <cdawson@mozilla.com>
Date: Wed, 21 Feb 2018 14:16:55 -0800
Subject: [PATCH] Bug 1438492 - Fix tooltip for commit messages and authors
 (#3249)

---
 tests/ui/unit/react/revisions.tests.jsx |  2 +-
 ui/job-view/Revision.jsx                | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/ui/unit/react/revisions.tests.jsx b/tests/ui/unit/react/revisions.tests.jsx
index c9415c9fc..8d20e283e 100644
--- a/tests/ui/unit/react/revisions.tests.jsx
+++ b/tests/ui/unit/react/revisions.tests.jsx
@@ -207,7 +207,7 @@ describe('initials filter', function () {
     const initials = mount(<Initials title={`${name}: ${email}`}
                                      author={name}
     />);
-    expect(initials.html()).toEqual('<span><span class="user-push-icon" title="Starscream: foo@bar.baz"><i class="fa fa-user-o" aria-hidden="true"></i></span><div class="icon-superscript user-push-initials">S</div></span>');
+    expect(initials.html()).toEqual('<span title="Starscream: foo@bar.baz"><span class="user-push-icon"><i class="fa fa-user-o" aria-hidden="true"></i></span><div class="icon-superscript user-push-initials">S</div></span>');
   });
 
   it('initializes a two-word name', function () {
diff --git a/ui/job-view/Revision.jsx b/ui/job-view/Revision.jsx
index 312fe3633..d290ee1a0 100644
--- a/ui/job-view/Revision.jsx
+++ b/ui/job-view/Revision.jsx
@@ -16,8 +16,8 @@ export const Initials = (props) => {
     }
 
     return (
-      <span>
-        <span className="user-push-icon" title={props.title}>
+      <span title={props.title}>
+        <span className="user-push-icon">
           <i className="fa fa-user-o" aria-hidden="true" />
         </span>
         <div className="icon-superscript user-push-initials">{initials}</div>
@@ -30,9 +30,9 @@ export class Revision extends React.PureComponent {
     super(props);
     const { revision, linkifyBugsFilter } = this.props;
 
-    const escapedComment = _.escape(revision.comments.split('\n')[0]);
-    this.escapedCommentHTML = { __html: linkifyBugsFilter(escapedComment) };
-    this.tags = escapedComment.search('Backed out') >= 0 || escapedComment.search('Back out') >= 0 ?
+    this.escapedComment = _.escape(revision.comments.split('\n')[0]);
+    this.escapedCommentHTML = { __html: linkifyBugsFilter(this.escapedComment) };
+    this.tags = this.escapedComment.search('Backed out') >= 0 || this.escapedComment.search('Back out') >= 0 ?
         'backout' : '';
   }
 
@@ -54,7 +54,7 @@ export class Revision extends React.PureComponent {
         <Initials title={`${name}: ${email}`}
                   author={name}
         />
-        <span title={this.comment}>
+        <span title={this.escapedComment}>
           <span className="revision-comment">
             <em dangerouslySetInnerHTML={this.escapedCommentHTML} />
           </span>