IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "DEV: makes autocomplete debounced (#9941)"

Browse Source 
This reverts commit f9e715672b.

Sadly this debounce fix appears to break @mention autocomplete,
reverting for now.
This commit is contained in:
Sam Saffron 2020-06-03 08:40:21 +10:00
parent 688d9428fe
commit 10e321a96f
No known key found for this signature in database
GPG Key ID: B9606168D2FFD9F5
1 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/assets/javascripts/discourse/app/lib/autocomplete.js
View File

@ -1,5 +1,4 @@
import { INPUT_DELAY } from "discourse-common/config/environment"; import { cancel, later } from "@ember/runloop";
import { debounce, cancel, later } from "@ember/runloop";
import { iconHTML } from "discourse-common/lib/icon-library"; import { iconHTML } from "discourse-common/lib/icon-library";
import { setCaretPosition, caretPosition } from "discourse/lib/utilities"; import { setCaretPosition, caretPosition } from "discourse/lib/utilities";
import Site from "discourse/models/site"; import Site from "discourse/models/site";
@ -414,7 +413,9 @@ export default function(options) {
return options.triggerRule ? options.triggerRule(me[0], opts) : true; return options.triggerRule ? options.triggerRule(me[0], opts) : true;
} }
function debouncedInput() { $(this).on("keyup.autocomplete", function(e) {
if ([keys.esc, keys.enter].indexOf(e.which) !== -1) return true;
let cp = caretPosition(me[0]); let cp = caretPosition(me[0]);
const key = me[0].value[cp - 1]; const key = me[0].value[cp - 1];
@ -425,7 +426,7 @@ export default function(options) {
completeStart = cp - match[0].length; completeStart = cp - match[0].length;
completeEnd = completeStart + match[0].length - 1; completeEnd = completeStart + match[0].length - 1;
let term = match[0].substring(1, match[0].length); let term = match[0].substring(1, match[0].length);
debouncedUpdateAutocomplete(term, options); updateAutoComplete(dataSource(term, options));
} }
} }
} }
@ -438,24 +439,15 @@ export default function(options) {
(!prevChar || allowedLettersRegex.test(prevChar)) (!prevChar || allowedLettersRegex.test(prevChar))
) { ) {
completeStart = completeEnd = cp - 1; completeStart = completeEnd = cp - 1;
debouncedUpdateAutocomplete("", options); updateAutoComplete(dataSource("", options));
} }
} }
} else if (completeStart !== null) { } else if (completeStart !== null) {
let term = me.val().substring(completeStart + (options.key ? 1 : 0), cp); let term = me.val().substring(completeStart + (options.key ? 1 : 0), cp);
debouncedUpdateAutocomplete(term, options); updateAutoComplete(dataSource(term, options));
} }
}
$(this).on("keyup.autocomplete", function(e) {
if ([keys.esc, keys.enter].indexOf(e.which) !== -1) return true;
debounce(this, debouncedInput, INPUT_DELAY);
}); });
function debouncedUpdateAutocomplete(t, o) {
updateAutoComplete(dataSource(t, o));
}
$(this).on("keydown.autocomplete", function(e) { $(this).on("keydown.autocomplete", function(e) {
var c, i, initial, prev, prevIsGood, stopFound, term, total, userToComplete; var c, i, initial, prev, prevIsGood, stopFound, term, total, userToComplete;
let cp; let cp;
@ -504,13 +496,7 @@ export default function(options) {
) { ) {
completeStart = c; completeStart = c;
term = me[0].value.substring(c + 1, initial); term = me[0].value.substring(c + 1, initial);
debounce( updateAutoComplete(dataSource(term, options));
this,
debouncedUpdateAutocomplete,
term,
options,
INPUT_DELAY
);
return true; return true;
} }
} }
@ -597,13 +583,7 @@ export default function(options) {
closeAutocomplete(); closeAutocomplete();
} }
debounce( updateAutoComplete(dataSource(term, options));
this,
debouncedUpdateAutocomplete,
term,
options,
INPUT_DELAY
);
return true; return true;
default: default:
completeEnd = cp; completeEnd = cp;