Fix: Fallback value of title used for component feedback when _feedback.title not set (509) (#510)

* Fix: Fallback value of displayTitle used for component feedback when _feedback.title not set

* Using title attribute as per help text

* Simplification of hbs file

* Fix: Moved title and isAltTitle setting to getFeedback call so notify has it available

Author: cahirodoherty-learningpool

js/models/questionModel.js

@@ -283,20 +283,21 @@ class QuestionModel extends ComponentModel {
       ) || {};
     };
 
+    const altTitle = feedback.altTitle || Adapt.course.get('_globals')._accessibility.altFeedbackTitle;
+    const title = feedback.title || this.get('title') || altTitle || '';
+
     const feedbackConfig = {
-      altTitle: feedback.altTitle ||
-        Adapt.course.get('_globals')._accessibility.altFeedbackTitle ||
-        '',
-      title: feedback.title ||
-        '',
+      isAltTitle: (title === altTitle),
+      altTitle,
+      title: Handlebars.compile(title)(this.toJSON()),
       _classes: feedback._classes,
       ...(isLegacyConfig
         ? getLegacyConfigObject()
         : getConfigObject()
       )
     };
 
-    if (feedbackConfig?._graphic?._src && !feedbackConfig?._imageAlignment) {
+    if (feedbackConfig._graphic?._src && !feedbackConfig._imageAlignment) {
       feedbackConfig._imageAlignment = 'right';
     }
 
@@ -307,8 +308,8 @@ class QuestionModel extends ComponentModel {
   setupFeedback() {
     if (!this.has('_feedback')) return;
     const { altTitle = '', title = '', body = '' } = this.getFeedback();
+
     this.set({
-      altFeedbackTitle: Handlebars.compile(altTitle)(this.toJSON()),
       feedbackTitle: Handlebars.compile(title)(this.toJSON()),
       feedbackMessage: Handlebars.compile(body)(this.toJSON())
     });

templates/notifyPopup.hbs

@@ -14,23 +14,17 @@
         {{/if}}
 
         {{#if title}}
-        <div class="notify__title" id="notify-heading">
+        <div class="notify__title{{#if isAltTitle}} aria-label{{/if}}" id="notify-heading">
           <div class="notify__title-inner" role="heading" aria-level="{{a11y_aria_level _id 'notify' _ariaLevel}}">
             {{{compile title}}}
           </div>
         </div>
-        {{else if altTitle}}
-          <div class="notify__title aria-label" id="notify-heading">
-            <div class="notify__title-inner" role="heading" aria-level="{{a11y_aria_level _id 'notify' _ariaLevel}}">
-              {{{compile altTitle}}}
-            </div>
-          </div>
         {{/if}}
 
         {{#any _graphic._src body}}
         <div class="notify__section">
           <div class="notify__section-inner">
-          
+
             {{#if _graphic._src}}
             {{#any (equals _imageAlignment 'left') (equals _imageAlignment 'top')}}
             <div class="notify__image-container{{#if _graphic.attribution}} has-attribution{{/if}}">
@@ -45,15 +39,15 @@
             </div>
             {{~/any~}}
             {{~/if~}}
-            
+
             {{~#if body~}}
             <div class="notify__body">
               <div class="notify__body-inner">
                 {{{compile body}}}
               </div>
             </div>
             {{~/if~}}
-            
+
             {{~#if _graphic._src~}}
             {{~#any (equals _imageAlignment 'right') (equals _imageAlignment 'bottom')~}}
             <div class="notify__image-container{{#if _graphic.attribution}} has-attribution{{/if}}">
@@ -68,11 +62,11 @@
             </div>
             {{/any}}
             {{/if}}
-            
+
           </div>
         </div>
         {{/any}}
-        
+
         {{#equals _type "alert"}}
         <div class="notify__btn-container">
           <button class="btn-text notify__btn notify__btn-alert js-notify-btn-alert" aria-label="{{{confirmText}}}">