tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge pull request #149 from glitch-soc/mojon-suggest"

Browse Source 
This reverts commit fa3587645d, reversing
changes made to 15c9c2fd7e.
This commit is contained in:
Ondřej Hruška
2017-09-28 08:55:53 +02:00
parent 210e6776fc
commit 8a24ad5828
6 changed files with 17 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/javascript/mastodon/features/compose/components/autosuggest_shortcode.js
View File

@ -1,38 +0,0 @@
import React from 'react';
import ImmutablePureComponent from 'react-immutable-pure-component';
import PropTypes from 'prop-types';
import emojione from 'emojione';
// This is bad, but I don't know how to make it work without importing the entirety of emojione.
// taken from some old version of mastodon before they gutted emojione to "emojione_light"
const shortnameToImage = str => str.replace(emojione.regShortNames, shortname => {
if (typeof shortname === 'undefined' || shortname === '' || !(shortname in emojione.emojioneList)) {
return shortname;
}
const unicode = emojione.emojioneList[shortname].unicode[emojione.emojioneList[shortname].unicode.length - 1];
const alt = emojione.convert(unicode.toUpperCase());
return `<img draggable="false" class="emojione" alt="${alt}" src="/emoji/${unicode}.svg" />`;
});
export default class AutosuggestShortcode extends ImmutablePureComponent {
static propTypes = {
shortcode: PropTypes.string.isRequired,
};
render () {
const { shortcode } = this.props;
let emoji = shortnameToImage(shortcode);
return (
<div className='autosuggest-account'>
<div className='autosuggest-account-icon' dangerouslySetInnerHTML={{ __html: emoji }} />
{shortcode}
</div>
);
}
}

5
app/javascript/mastodon/features/compose/components/compose_form.js
View File

@ -98,10 +98,6 @@ export default class ComposeForm extends ImmutablePureComponent {
this.props.onFetchSuggestions(token);
}, 500, { trailing: true })
onLocalSuggestionsFetchRequested = debounce((token) => {
this.props.onFetchSuggestions(token);
}, 100, { trailing: true })
onSuggestionSelected = (tokenStart, token, value) => {
this._restoreCaret = null;
this.props.onSuggestionSelected(tokenStart, token, value);
@ -238,7 +234,6 @@ export default class ComposeForm extends ImmutablePureComponent {
suggestions={this.props.suggestions}
onKeyDown={this.handleKeyDown}
onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
onLocalSuggestionsFetchRequested={this.onLocalSuggestionsFetchRequested}
onSuggestionsClearRequested={this.onSuggestionsClearRequested}
onSuggestionSelected={this.onSuggestionSelected}
onPaste={onPaste}