From c1c851d7817cdc1df4cf5f2bccd9a4d3feae94a8 Mon Sep 17 00:00:00 2001 From: siikamiika Date: Tue, 17 Oct 2017 17:57:44 +0300 Subject: [PATCH] merged mode: support {audio} marker (first term) --- ext/bg/js/audio.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ext/bg/js/audio.js b/ext/bg/js/audio.js index ce47490c..549288f5 100644 --- a/ext/bg/js/audio.js +++ b/ext/bg/js/audio.js @@ -140,8 +140,13 @@ async function audioInject(definition, fields, mode) { } try { - const url = await audioBuildUrl(definition, mode); - const filename = audioBuildFilename(definition); + let audioSourceDefinition = definition; + if (definition.hasOwnProperty('expressions')) { + audioSourceDefinition = definition.expressions[0]; + } + + const url = await audioBuildUrl(audioSourceDefinition, mode); + const filename = audioBuildFilename(audioSourceDefinition); if (url && filename) { definition.audio = {url, filename};