Michael Brown d9a02d1336
Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse""
This reverts commit 20780a1eeed56b321daf18ee6bbfe681a51d1bf4.

* SECURITY: re-adds accidentally reverted commit:
  03d26cd6: ensure embed_url contains valid http(s) uri
* when the merge commit e62a85cf was reverted, git chose the 2660c2e2 parent to land on
  instead of the 03d26cd6 parent (which contains security fixes)
2020-05-23 00:56:13 -04:00

45 lines
1.2 KiB
JavaScript

import MultiSelectComponent from "select-kit/components/multi-select";
import { MAIN_COLLECTION } from "select-kit/components/select-kit";
import { computed } from "@ember/object";
import { readOnly } from "@ember/object/computed";
import { makeArray } from "discourse-common/lib/helpers";
export default MultiSelectComponent.extend({
pluginApiIdentifiers: ["list-setting"],
classNames: ["list-setting"],
choices: null,
nameProperty: null,
valueProperty: null,
content: readOnly("choices"),
selectKitOptions: {
filterable: true,
selectedNameComponent: "selectedNameComponent"
},
modifyComponentForRow(collection) {
if (
collection === MAIN_COLLECTION &&
this.settingName &&
this.settingName.indexOf("color") > -1
) {
return "create-color-row";
}
},
selectedNameComponent: computed("settingName", function() {
if (this.settingName && this.settingName.indexOf("color") > -1) {
return "selected-color";
} else {
return "selected-name";
}
}),
deselect(value) {
this.onChangeChoices &&
this.onChangeChoices([...new Set([value, ...makeArray(this.choices)])]);
this._super(...arguments);
}
});