use htmlTitle

ppy · Sep 19, 2023 · f4f6cc9 · f4f6cc9
1 parent e041d9f
commit f4f6cc9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/resources/js/core-legacy/tooltip-default.coffee b/resources/js/core-legacy/tooltip-default.coffee
@@ -24,8 +24,6 @@ export default class TooltipDefault
     $content =
       if isTime
         @timeagoTip el, title
-      else if (dateString = el.dataset.date)?
-        @tipWithDate el, title, dateString
       else
         htmlTitle ? $('<span>').text(title)
 
@@ -142,20 +140,6 @@ export default class TooltipDefault
       .append $dateEl
       .append ' '
       .append $timeEl
-
-  tipWithDate: (el, title, dateString) =>
-    date = moment(dateString)
-
-    $titleEl = $('<div>')
-      .text title
-
-    $dateEl = $('<div>')
-      .addClass 'tooltip-default__date'
-      .text date.format('LL')
-
-    $('<div>')
-      .append $titleEl
-      .append $dateEl
 
 
   tzString: (time) ->

diff --git a/resources/js/profile-page/badges.tsx b/resources/js/profile-page/badges.tsx
@@ -3,6 +3,7 @@
 
 import Img2x from 'components/img2x';
 import UserBadgeJson from 'interfaces/user-badge-json';
+import * as moment from 'moment';
 import * as React from 'react';
 import { Modifiers, classWithModifiers } from 'utils/css';
 import { present } from 'utils/string';
@@ -21,12 +22,16 @@ export default class Badges extends React.PureComponent<Props> {
     return (
       <div className={classWithModifiers('profile-badges', this.props.modifiers)}>
         {this.props.badges.map((badge) => {
+          const hasDate = present(badge.awarded_at);
+          const htmlTitle = hasDate ?`<div>${badge.description}</div>
+            <div class='tooltip-default__date'>${moment(badge.awarded_at).format('LL')}</div>` : null;
+
           const img = (
             <Img2x
               className='profile-badges__badge'
-              data-date={badge.awarded_at}
+              data-html-title={htmlTitle}
               src={badge.image_url}
-              title={badge.description}
+              title={hasDate ? '' : badge.description}
             />
           );