[Glitch] Play animated custom emoji on hover
Port 7de8c51873b51d8450f7a6597a43d454964d0407 to glitch-soc
This commit is contained in:
		
							parent
							
								
									621590b4ab
								
							
						
					
					
						commit
						c1231a846a
					
				@ -2,6 +2,7 @@ import React from 'react';
 | 
				
			|||||||
import ImmutablePropTypes from 'react-immutable-proptypes';
 | 
					import ImmutablePropTypes from 'react-immutable-proptypes';
 | 
				
			||||||
import PropTypes from 'prop-types';
 | 
					import PropTypes from 'prop-types';
 | 
				
			||||||
import classNames from 'classnames';
 | 
					import classNames from 'classnames';
 | 
				
			||||||
 | 
					import { autoPlayGif } from 'flavours/glitch/util/initial_state';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export default class DisplayName extends React.PureComponent {
 | 
					export default class DisplayName extends React.PureComponent {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -14,6 +15,47 @@ export default class DisplayName extends React.PureComponent {
 | 
				
			|||||||
    handleClick: PropTypes.func,
 | 
					    handleClick: PropTypes.func,
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  _updateEmojis () {
 | 
				
			||||||
 | 
					    const node = this.node;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!node || autoPlayGif) {
 | 
				
			||||||
 | 
					      return;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    const emojis = node.querySelectorAll('.custom-emoji');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    for (var i = 0; i < emojis.length; i++) {
 | 
				
			||||||
 | 
					      let emoji = emojis[i];
 | 
				
			||||||
 | 
					      if (emoji.classList.contains('status-emoji')) {
 | 
				
			||||||
 | 
					        continue;
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					      emoji.classList.add('status-emoji');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      emoji.addEventListener('mouseenter', this.handleEmojiMouseEnter, false);
 | 
				
			||||||
 | 
					      emoji.addEventListener('mouseleave', this.handleEmojiMouseLeave, false);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  componentDidMount () {
 | 
				
			||||||
 | 
					    this._updateEmojis();
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  componentDidUpdate () {
 | 
				
			||||||
 | 
					    this._updateEmojis();
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  handleEmojiMouseEnter = ({ target }) => {
 | 
				
			||||||
 | 
					    target.src = target.getAttribute('data-original');
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  handleEmojiMouseLeave = ({ target }) => {
 | 
				
			||||||
 | 
					    target.src = target.getAttribute('data-static');
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  setRef = (c) => {
 | 
				
			||||||
 | 
					    this.node = c;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  render() {
 | 
					  render() {
 | 
				
			||||||
    const { account, className, inline, localDomain, others, onAccountClick } = this.props;
 | 
					    const { account, className, inline, localDomain, others, onAccountClick } = this.props;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -58,7 +100,7 @@ export default class DisplayName extends React.PureComponent {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return (
 | 
					    return (
 | 
				
			||||||
      <span className={computedClass}>
 | 
					      <span className={computedClass} ref={this.setRef}>
 | 
				
			||||||
        {displayName}
 | 
					        {displayName}
 | 
				
			||||||
        {inline ? ' ' : null}
 | 
					        {inline ? ' ' : null}
 | 
				
			||||||
        {suffix}
 | 
					        {suffix}
 | 
				
			||||||
 | 
				
			|||||||
@ -5,6 +5,7 @@ import { isRtl } from 'flavours/glitch/util/rtl';
 | 
				
			|||||||
import { FormattedMessage } from 'react-intl';
 | 
					import { FormattedMessage } from 'react-intl';
 | 
				
			||||||
import Permalink from './permalink';
 | 
					import Permalink from './permalink';
 | 
				
			||||||
import classnames from 'classnames';
 | 
					import classnames from 'classnames';
 | 
				
			||||||
 | 
					import { autoPlayGif } from 'flavours/glitch/util/initial_state';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export default class StatusContent extends React.PureComponent {
 | 
					export default class StatusContent extends React.PureComponent {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -57,12 +58,35 @@ export default class StatusContent extends React.PureComponent {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  _updateStatusEmojis () {
 | 
				
			||||||
 | 
					    const node = this.node;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!node || autoPlayGif) {
 | 
				
			||||||
 | 
					      return;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    const emojis = node.querySelectorAll('.custom-emoji');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    for (var i = 0; i < emojis.length; i++) {
 | 
				
			||||||
 | 
					      let emoji = emojis[i];
 | 
				
			||||||
 | 
					      if (emoji.classList.contains('status-emoji')) {
 | 
				
			||||||
 | 
					        continue;
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					      emoji.classList.add('status-emoji');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      emoji.addEventListener('mouseenter', this.handleEmojiMouseEnter, false);
 | 
				
			||||||
 | 
					      emoji.addEventListener('mouseleave', this.handleEmojiMouseLeave, false);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  componentDidMount () {
 | 
					  componentDidMount () {
 | 
				
			||||||
    this._updateStatusLinks();
 | 
					    this._updateStatusLinks();
 | 
				
			||||||
 | 
					    this._updateStatusEmojis();
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  componentDidUpdate () {
 | 
					  componentDidUpdate () {
 | 
				
			||||||
    this._updateStatusLinks();
 | 
					    this._updateStatusLinks();
 | 
				
			||||||
 | 
					    this._updateStatusEmojis();
 | 
				
			||||||
    if (this.props.onUpdate) this.props.onUpdate();
 | 
					    if (this.props.onUpdate) this.props.onUpdate();
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -86,6 +110,14 @@ export default class StatusContent extends React.PureComponent {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  handleEmojiMouseEnter = ({ target }) => {
 | 
				
			||||||
 | 
					    target.src = target.getAttribute('data-original');
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  handleEmojiMouseLeave = ({ target }) => {
 | 
				
			||||||
 | 
					    target.src = target.getAttribute('data-static');
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  handleMouseDown = (e) => {
 | 
					  handleMouseDown = (e) => {
 | 
				
			||||||
    this.startXY = [e.clientX, e.clientY];
 | 
					    this.startXY = [e.clientX, e.clientY];
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
				
			|||||||
@ -71,6 +71,47 @@ class Header extends ImmutablePureComponent {
 | 
				
			|||||||
    window.open('/settings/profile', '_blank');
 | 
					    window.open('/settings/profile', '_blank');
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  _updateEmojis () {
 | 
				
			||||||
 | 
					    const node = this.node;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (!node || autoPlayGif) {
 | 
				
			||||||
 | 
					      return;
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    const emojis = node.querySelectorAll('.custom-emoji');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    for (var i = 0; i < emojis.length; i++) {
 | 
				
			||||||
 | 
					      let emoji = emojis[i];
 | 
				
			||||||
 | 
					      if (emoji.classList.contains('status-emoji')) {
 | 
				
			||||||
 | 
					        continue;
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					      emoji.classList.add('status-emoji');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					      emoji.addEventListener('mouseenter', this.handleEmojiMouseEnter, false);
 | 
				
			||||||
 | 
					      emoji.addEventListener('mouseleave', this.handleEmojiMouseLeave, false);
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  componentDidMount () {
 | 
				
			||||||
 | 
					    this._updateEmojis();
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  componentDidUpdate () {
 | 
				
			||||||
 | 
					    this._updateEmojis();
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  handleEmojiMouseEnter = ({ target }) => {
 | 
				
			||||||
 | 
					    target.src = target.getAttribute('data-original');
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  handleEmojiMouseLeave = ({ target }) => {
 | 
				
			||||||
 | 
					    target.src = target.getAttribute('data-static');
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  setRef = (c) => {
 | 
				
			||||||
 | 
					    this.node = c;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  render () {
 | 
					  render () {
 | 
				
			||||||
    const { account, intl, domain, identity_proofs } = this.props;
 | 
					    const { account, intl, domain, identity_proofs } = this.props;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -193,7 +234,7 @@ class Header extends ImmutablePureComponent {
 | 
				
			|||||||
    const acct            = account.get('acct').indexOf('@') === -1 && domain ? `${account.get('acct')}@${domain}` : account.get('acct');
 | 
					    const acct            = account.get('acct').indexOf('@') === -1 && domain ? `${account.get('acct')}@${domain}` : account.get('acct');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return (
 | 
					    return (
 | 
				
			||||||
      <div className={classNames('account__header', { inactive: !!account.get('moved') })}>
 | 
					      <div className={classNames('account__header', { inactive: !!account.get('moved') })} ref={this.setRef}>
 | 
				
			||||||
        <div className='account__header__image'>
 | 
					        <div className='account__header__image'>
 | 
				
			||||||
          <div className='account__header__info'>
 | 
					          <div className='account__header__info'>
 | 
				
			||||||
            {info}
 | 
					            {info}
 | 
				
			||||||
 | 
				
			|||||||
@ -4,6 +4,7 @@ import ready from 'flavours/glitch/util/ready';
 | 
				
			|||||||
function main() {
 | 
					function main() {
 | 
				
			||||||
  const IntlMessageFormat = require('intl-messageformat').default;
 | 
					  const IntlMessageFormat = require('intl-messageformat').default;
 | 
				
			||||||
  const { timeAgoString } = require('flavours/glitch/components/relative_timestamp');
 | 
					  const { timeAgoString } = require('flavours/glitch/components/relative_timestamp');
 | 
				
			||||||
 | 
					  const { delegate } = require('rails-ujs');
 | 
				
			||||||
  const emojify = require('flavours/glitch/util/emoji').default;
 | 
					  const emojify = require('flavours/glitch/util/emoji').default;
 | 
				
			||||||
  const { getLocale } = require('locales');
 | 
					  const { getLocale } = require('locales');
 | 
				
			||||||
  const { messages } = getLocale();
 | 
					  const { messages } = getLocale();
 | 
				
			||||||
@ -23,6 +24,12 @@ function main() {
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  const getEmojiAnimationHandler = (swapTo) => {
 | 
				
			||||||
 | 
					    return ({ target }) => {
 | 
				
			||||||
 | 
					      target.src = target.getAttribute(swapTo);
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  ready(() => {
 | 
					  ready(() => {
 | 
				
			||||||
    const locale = document.documentElement.lang;
 | 
					    const locale = document.documentElement.lang;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -94,6 +101,9 @@ function main() {
 | 
				
			|||||||
      document.head.appendChild(scrollbarWidthStyle);
 | 
					      document.head.appendChild(scrollbarWidthStyle);
 | 
				
			||||||
      scrollbarWidthStyle.sheet.insertRule(`body.with-modals--active { margin-right: ${scrollbarWidth}px; }`, 0);
 | 
					      scrollbarWidthStyle.sheet.insertRule(`body.with-modals--active { margin-right: ${scrollbarWidth}px; }`, 0);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    delegate(document, '.custom-emoji', 'mouseover', getEmojiAnimationHandler('data-original'));
 | 
				
			||||||
 | 
					    delegate(document, '.custom-emoji', 'mouseout', getEmojiAnimationHandler('data-static'));
 | 
				
			||||||
  });
 | 
					  });
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -29,7 +29,7 @@ const emojify = (str, customEmojis = {}) => {
 | 
				
			|||||||
        // if you want additional emoji handler, add statements below which set replacement and return true.
 | 
					        // if you want additional emoji handler, add statements below which set replacement and return true.
 | 
				
			||||||
        if (shortname in customEmojis) {
 | 
					        if (shortname in customEmojis) {
 | 
				
			||||||
          const filename = autoPlayGif ? customEmojis[shortname].url : customEmojis[shortname].static_url;
 | 
					          const filename = autoPlayGif ? customEmojis[shortname].url : customEmojis[shortname].static_url;
 | 
				
			||||||
          replacement = `<img draggable="false" class="emojione" alt="${shortname}" title="${shortname}" src="${filename}" />`;
 | 
					          replacement = `<img draggable="false" class="emojione custom-emoji" alt="${shortname}" title="${shortname}" src="${filename}" data-original="${customEmojis[shortname].url}" data-static="${customEmojis[shortname].static_url}" />`;
 | 
				
			||||||
          return true;
 | 
					          return true;
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        return false;
 | 
					        return false;
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user