FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TURBO shortcode search

This commit is contained in:
Ondřej Hruška 2017-09-20 21:57:33 +02:00
parent cbf00168f1
commit a3760b7729
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/javascript/mastodon/components/autosuggest_textarea.js
View File

@ -43,6 +43,7 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
onSuggestionSelected: PropTypes.func.isRequired,
onSuggestionsClearRequested: PropTypes.func.isRequired,
onSuggestionsFetchRequested: PropTypes.func.isRequired,
onLocalSuggestionsFetchRequested: PropTypes.func.isRequired,
onChange: PropTypes.func.isRequired,
onKeyUp: PropTypes.func,
onKeyDown: PropTypes.func,
@ -66,7 +67,13 @@ export default class AutosuggestTextarea extends ImmutablePureComponent {
if (token !== null && this.state.lastToken !== token) {
this.setState({ lastToken: token, selectedSuggestion: 0, tokenStart });
this.props.onSuggestionsFetchRequested(token);
if (token[0] === ':') {
// faster debounce for shortcodes.
// hashtags have long debounce because they're fetched from server.
this.props.onLocalSuggestionsFetchRequested(token);
} else {
this.props.onSuggestionsFetchRequested(token);
}
} else if (token === null) {
this.setState({ lastToken: null });
this.props.onSuggestionsClearRequested();

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

@ -90,6 +90,10 @@ 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);
@ -186,6 +190,7 @@ 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}