diff options
Diffstat (limited to 'ext/mixed/js/display-audio.js')
| -rw-r--r-- | ext/mixed/js/display-audio.js | 8 | 
1 files changed, 4 insertions, 4 deletions
| diff --git a/ext/mixed/js/display-audio.js b/ext/mixed/js/display-audio.js index c60831b1..f624d85b 100644 --- a/ext/mixed/js/display-audio.js +++ b/ext/mixed/js/display-audio.js @@ -112,7 +112,7 @@ class DisplayAudio {          const {expression, reading} = expressionReading;          const audioOptions = this._getAudioOptions(); -        const {textToSpeechVoice, customSourceUrl, volume} = audioOptions; +        const {textToSpeechVoice, customSourceUrl, customSourceType, volume} = audioOptions;          if (!Array.isArray(sources)) {              ({sources} = audioOptions);          } @@ -126,7 +126,7 @@ class DisplayAudio {              // Create audio              let audio;              let title; -            const info = await this._createExpressionAudio(sources, sourceDetailsMap, expression, reading, {textToSpeechVoice, customSourceUrl}); +            const info = await this._createExpressionAudio(sources, sourceDetailsMap, expression, reading, {textToSpeechVoice, customSourceUrl, customSourceType});              if (info !== null) {                  let source;                  ({audio, source} = info); @@ -520,13 +520,13 @@ class DisplayAudio {              // Entry info              entry.index = i; -            const {audio, audioResolved, title} = infoList[i]; +            const {audio, audioResolved, info: {name}} = infoList[i];              if (audioResolved) { entry.valid = (audio !== null); }              const labelNode = entry.node.querySelector('.popup-menu-item-label');              let label = defaultLabel;              if (ii > 1) { label = `${label} ${i + 1}`; } -            if (typeof title === 'string' && title.length > 0) { label += `: ${title}`; } +            if (typeof name === 'string' && name.length > 0) { label += `: ${name}`; }              labelNode.textContent = label;          } |