github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-19 21:43:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

REFACTOR: tags mixin (#7533)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2019-05-13 17:05:21 +02:00 committed by GitHub
parent b8db702a02
commit 7326ddea6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/javascripts/select-kit/mixins/tags.js.es6
View File

@ -11,8 +11,6 @@ export default Ember.Mixin.create({
},
searchTags(url, data, callback) {
const self = this;
this.startLoading();
return ajax(Discourse.getURL(url), {
@ -22,15 +20,11 @@ export default Ember.Mixin.create({
data
})
.then(json => {
self.set("asyncContent", callback(self, json));
self.autoHighlight();
this.set("asyncContent", callback(this, json));
this.autoHighlight();
})
.catch(error => {
popupAjaxError(error);
})
.finally(() => {
self.stopLoading();
});
.catch(error => popupAjaxError(error))
.finally(() => this.stopLoading());
},
validateCreate(term) {
@ -63,6 +57,7 @@ export default Ember.Mixin.create({
const inSelection = this.get("selection")
.map(s => toLowerCaseOrUndefined(get(s, "value")))
.includes(term);
if (inCollection || inSelection) {
return false;
}
@ -72,7 +67,7 @@ export default Ember.Mixin.create({
createContentFromInput(input) {
// See lib/discourse_tagging#clean_tag.
var content = input
let content = input
.trim()
.replace(/\s+/g, "-")
.replace(/[\/\?#\[\]@!\$&'\(\)\*\+,;=\.%\\`^\s|\{\}"<>]+/g, "")