Merge pull request #359 from alexander-heimbuch/fix/baseurl

fix(baseurl): Provide base url as asset base
podlove · Apr 15, 2017 · dedfad7 · dedfad7
2 parents cde98e5 + 3052775
commit dedfad7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/embed/embed.js b/src/embed/embed.js
@@ -91,7 +91,7 @@ const configNode = (config = {}) =>
     .then(config => tag('script', `window.PODLOVE = ${JSON.stringify(config)}`))
 
 // Player Logic
-const appLogic = tag('script', '', {type: 'text/javascript', src: './window.js'})
+const appLogic = config => tag('script', '', {type: 'text/javascript', src: `${get(config.reference, 'base', '.')}/window.js`})
 
 // Dynamic resizer
 const dynamicResizer = tag('script', iframeResizerContentWindow)
@@ -104,11 +104,11 @@ window.podlovePlayer = (selector, config) => {
   const anchor = typeof selector === 'string' ? head(findNode(selector)) : selector
 
   return Bluebird.all([
-      playerEntry,
-      configNode(config),
-      appLogic,
-      dynamicResizer
-    ])
-    .then(result => result.join(''))
-    .then(renderPlayer(anchor))
+    playerEntry,
+    configNode(config),
+    appLogic(config),
+    dynamicResizer
+  ])
+  .then(result => result.join(''))
+  .then(renderPlayer(anchor))
 }
diff --git a/statics/config.html b/statics/config.html
@@ -129,13 +129,15 @@ <h1>Configuration</h1>
                         <tr><th colspan="2">References</th></tr>
                     </thead>
                     <tbody>
-                        <tr><td>reference.config</td><td>Reference to the Current Configuration</td></tr>
-                        <tr><td>reference.share</td><td>Reference Sharing Embed Endpoint</td></tr>
+                        <tr><td>reference.base</td><td>Reference to webplayer base, if not provided it falls back to the current url</td></tr>
+                        <tr><td>reference.config</td><td>Reference to the current configuration</td></tr>
+                        <tr><td>reference.share</td><td>Reference sharing embed endpoint</td></tr>
                     </tbody>
                 </table>
 
 <pre><code class="language-js">{
     reference: {
+        base: &#x27;//podlove-player.surge.sh&#x27;,
         config: &#x27;//podlove-player.surge.sh/fixtures/example.json&#x27;,
         share: &#x27;//podlove-player.surge.sh/share&#x27;
     }