FIX: makes whisper state more resilient (#6889)

This commit also moves some logic from model to controller.
2025-02-25 18:55:32 -06:00 · 2019-01-16 15:23:06 +01:00
parent b46b6e72d1
commit 1ac4dc5b73
4 changed files with 78 additions and 30 deletions
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -25,7 +25,7 @@
                  {{plugin-outlet name="composer-action-after" noTags=true args=(hash model=model)}}

                  {{#unless site.mobileView}}
-                    {{#if model.whisper}}
+                    {{#if isWhispering}}
                      <span class='whisper'>{{d-icon 'eye-slash'}}</span>
                    {{/if}}
                    {{#if model.unlistTopic}}
@@ -119,8 +119,8 @@
            <div class='save-or-cancel'>
              {{#unless model.viewFullscreen}}
                {{composer-save-button action=(action "save")
-                                       icon=model.saveIcon
-                                       label=model.saveLabel
+                                       icon=saveIcon
+                                       label=saveLabel
                                       disableSubmit=disableSubmit}}

              {{#if site.mobileView}}