hotfix embed code cross-origin issue

vizorvr · Jan 30, 2017 · 0f30744 · 0f30744
1 parent ff8cdf8
commit 0f30744
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/browser/scripts/ui/playerUI.js b/browser/scripts/ui/playerUI.js
@@ -245,6 +245,7 @@ var VizorPlayerUI = function() {
 			e.preventDefault()
 			var data = {
 				origin	: Vizor.origin,
+				embedOrigin: Vizor.embedOrigin,
 				shareURL : Vizor.shareURL,
 				embedSrc : Vizor.embedSrc
 			}

diff --git a/views/graph/show.handlebars b/views/graph/show.handlebars
@@ -76,14 +76,15 @@
             window.Vizor = {}
 
         Vizor.origin = window.location.origin
+        Vizor.embedOrigin = Vizor.origin.replace('https://','//').replace('http://','//')
         Vizor.isEditor = false
 
     {{#if graph.owner}}
-        Vizor.shareURL = window.location.origin + '/{{graph.owner}}/{{graph.name}}'
-        Vizor.embedSrc = window.location.origin + '/embed/{{graph.owner}}/{{graph.name}}'
+        Vizor.shareURL = Vizor.origin + '/{{graph.owner}}/{{graph.name}}'
+        Vizor.embedSrc = Vizor.embedOrigin + '/embed/{{graph.owner}}/{{graph.name}}'
     {{else}}
-        Vizor.shareURL = window.location.origin
-        Vizor.embedSrc = window.location.origin
+        Vizor.shareURL = Vizor.origin
+        Vizor.embedSrc = Vizor.embedOrigin
     {{/if}}
 
     {{#if autoplay}}

diff --git a/views/partials/playerShareDialog.handlebars b/views/partials/playerShareDialog.handlebars
@@ -6,6 +6,6 @@
     <section id="embedSource" class="collapsible">
         <label><a href="#embedcode" class="trigger">Embed code</a></label>
         <textarea id="embedcode" class="scrollbar target" readonly
-        ><script src="{{origin}}/scripts/embed.js" data-vizorurl="{{embedSrc}}" /></textarea>
+        ><script src="{{embedOrigin}}/scripts/embed.js" data-vizorurl="{{embedSrc}}" /></textarea>
     </section>
 </article>