mirror of
https://github.com/discourse/discourse.git
synced 2025-05-28 13:51:18 +08:00
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)
This commit is contained in:
@ -0,0 +1,25 @@
|
||||
import SelectKitHeaderComponent from "select-kit/components/select-kit/select-kit-header";
|
||||
import { computed } from "@ember/object";
|
||||
import { makeArray } from "discourse-common/lib/helpers";
|
||||
|
||||
export default SelectKitHeaderComponent.extend({
|
||||
classNames: ["multi-select-header"],
|
||||
layoutName:
|
||||
"select-kit/templates/components/multi-select/multi-select-header",
|
||||
|
||||
selectedNames: computed("selectedContent", function() {
|
||||
return makeArray(this.selectedContent).map(c => this.getName(c));
|
||||
}),
|
||||
|
||||
selectedValue: computed("selectedContent", function() {
|
||||
return makeArray(this.selectedContent)
|
||||
.map(c => {
|
||||
if (this.getName(c) !== this.getName(this.selectKit.noneItem)) {
|
||||
return this.getValue(c);
|
||||
}
|
||||
|
||||
return null;
|
||||
})
|
||||
.filter(Boolean);
|
||||
})
|
||||
});
|
Reference in New Issue
Block a user