Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00
Code Packages Activity Actions 13

FIX: makes composer-actions toggling whisper instead of replying

Browse source
This commit is contained in:
Joffrey JAFFEUX 2018-02-01 23:07:37 +01:00 • committed by GitHub
parent 0156ae486d
commit f7df68c9a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/discourse/templates/components/composer-action-title.hbs
View file

@ -4,7 +4,6 @@
{{composer-actions
composerModel=model
options=model.replyOptions
whispering=model.whisper
canWhisper=canWhisper
action=model.action}}
{{/if}}

35
app/assets/javascripts/select-kit/components/composer-actions.js.es6
View file

@ -28,8 +28,8 @@ export default DropdownSelectBoxComponent.extend({
return content;
},
@computed("options", "canWhisper", "whispering", "composerModel.post.username")
content(options, canWhisper, whispering, postUsername) {
@computed("options", "canWhisper", "composerModel.post.username")
content(options, canWhisper, postUsername) {
let items = [
{
name: I18n.t("composer.composer_actions.reply_as_new_topic.label"),
@ -58,21 +58,12 @@ export default DropdownSelectBoxComponent.extend({
}
if (canWhisper) {
if (whispering) {
items.push({
name: I18n.t("composer.composer_actions.reply_as_not_whisper.label"),
description: I18n.t("composer.composer_actions.reply_as_not_whisper.desc"),
icon: "eye",
id: "reply_as_not_whisper"
});
} else {
items.push({
name: I18n.t("composer.composer_actions.reply_as_whisper.label"),
description: I18n.t("composer.composer_actions.reply_as_whisper.desc"),
icon: "eye-slash",
id: "reply_as_whisper"
});
}
items.push({
name: I18n.t("composer.composer_actions.toggle_whisper.label"),
description: I18n.t("composer.composer_actions.toggle_whisper.desc"),
icon: "eye-slash",
id: "toggle_whisper"
});
}
return items;
@ -92,14 +83,8 @@ export default DropdownSelectBoxComponent.extend({
actions: {
onSelect(value) {
switch(value) {
case "reply_as_whisper":
this.set("composerModel.whisper", true);
this.get("composerController").save();
break;
case "reply_as_not_whisper":
this.set("composerModel.whisper", false);
this.get("composerController").save();
case "toggle_whisper":
this.set("composerModel.whisper", !this.get("composerModel.whisper"));
break;
case "reply_to_topic":