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

UX: don't show the whisper toggle when replying to a whisper

Browse Source
This commit is contained in:
Régis Hanol 2018-08-21 19:35:40 +02:00
parent 17dc8f2490
commit 61447a8046
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/assets/javascripts/discourse/controllers/composer.js.es6
View File

@ -203,15 +203,21 @@ export default Ember.Controller.extend({
canUnlistTopic: Em.computed.and("model.creatingTopic", "isStaffUser"), canUnlistTopic: Em.computed.and("model.creatingTopic", "isStaffUser"),
@computed("model.action", "isStaffUser") @computed("canWhisper", "model.whisper")
canWhisper(action, isStaffUser) { showWhisperToggle(canWhisper, isWhisper) {
return canWhisper && !isWhisper;
},
@computed("isStaffUser", "model.action")
canWhisper(isStaffUser, action) {
return ( return (
isStaffUser &&
this.siteSettings.enable_whispers && this.siteSettings.enable_whispers &&
action === Composer.REPLY isStaffUser &&
Composer.REPLY === action
); );
}, },
_setupPopupMenuOption(callback) { _setupPopupMenuOption(callback) {
let option = callback(); let option = callback();
@ -246,7 +252,7 @@ export default Ember.Controller.extend({
action: "toggleWhisper", action: "toggleWhisper",
icon: "eye-slash", icon: "eye-slash",
label: "composer.toggle_whisper", label: "composer.toggle_whisper",
condition: "canWhisper" condition: "showWhisperToggle"
}; };
}) })
); );