Skip to content

Commit e15763f

Browse files
authored
Merge pull request microsoft#99 from Microsoft/alihamud-live-code
enable getting embedUrl, embedId and accessToken from url params.
2 parents 4225d30 + a337a44 commit e15763f

File tree

4 files changed

+57
-8
lines changed

4 files changed

+57
-8
lines changed

demo/code-demo/report.html

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div id="steps-ul-dev">
66
<ul id="steps-ul" class="steps-ul">
77
<li id="steps-auth" class="steps-li-active" onclick="OpenAuthStep();"><a href="#">Authorize</a></li>
8-
<li id="steps-embed" onclick="OpenEmbedStepWithSample();"><a href="#">Embed</a></li>
8+
<li id="steps-embed" onclick="OpenEmbedStep();"><a href="#">Embed</a></li>
99
<li id="steps-interact" onclick="OpenInteractStep();"><a href="#">Interact</a></li>
1010
</ul>
1111
</div>
@@ -26,6 +26,15 @@ <h5>The following div id is <b>reportContainer</b>. In code, we embed a report t
2626
</div>
2727

2828
<script>
29-
// Open Authorization Step after this page loads.
30-
OpenAuthStep();
29+
var embedUrl = GetParameterByName("embedUrl");
30+
if (!embedUrl)
31+
{
32+
// Open Authorization Step after this page loads.
33+
OpenAuthStep();
34+
}
35+
else
36+
{
37+
OpenEmbedStep();
38+
}
39+
3140
</script>

demo/code-demo/scripts/session_utils.js

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,50 @@ function SetAccessTokenFromSession() {
4141
$("#txtAccessToken").val(sessionAccessToken);
4242
}
4343

44+
function SetAccessTokenFromSessionOrUrlParam() {
45+
var accessToken = GetParameterByName("accessToken");
46+
if (!accessToken)
47+
{
48+
accessToken = GetSession("accessToken");
49+
}
50+
51+
$("#txtAccessToken").val(accessToken);
52+
}
53+
54+
function GetParameterByName(name, url) {
55+
if (!url) {
56+
url = window.location.href;
57+
}
58+
name = name.replace(/[\[\]]/g, "\\$&");
59+
var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
60+
results = regex.exec(url);
61+
if (!results) return null;
62+
if (!results[2]) return '';
63+
return decodeURIComponent(results[2].replace(/\+/g, " "));
64+
}
65+
66+
function SetEmbedUrlFromSessionOrUrlParam() {
67+
var embedUrl = GetParameterByName("embedUrl");
68+
if (!embedUrl)
69+
{
70+
embedUrl = GetSession("embedUrl");
71+
}
72+
$("#txtReportEmbed").val(embedUrl);
73+
74+
var embedId = GetParameterByName("embedId");
75+
if (!embedId)
76+
{
77+
embedId = GetSession("embedId");
78+
}
79+
$("#txtEmbedReportId").val(embedId);
80+
}
81+
4482
function SetEmbedUrlFromSession() {
4583
var sessionEmbedUrl = GetSession("embedUrl");
4684
$("#txtReportEmbed").val(sessionEmbedUrl);
4785

4886
var sessionEmbedId = GetSession("embedId");
4987
$("#txtEmbedReportId").val(sessionEmbedId);
50-
}
88+
}
89+
90+

demo/code-demo/step_authorize.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ <h4>Enter Embed Details</h4>
4141
</div>
4242

4343
<script>
44-
SetEmbedUrlFromSession();
45-
SetAccessTokenFromSession();
44+
SetEmbedUrlFromSessionOrUrlParam();
45+
SetAccessTokenFromSessionOrUrlParam();
4646
</script>

demo/code-demo/step_embed.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ <h4>Code</h4>
2626
</div>
2727

2828
<script>
29-
SetEmbedUrlFromSession();
30-
SetAccessTokenFromSession();
29+
SetEmbedUrlFromSessionOrUrlParam();
30+
SetAccessTokenFromSessionOrUrlParam();
3131
SetEmbedCode(_Embed_BasicEmbed);
3232
</script>

0 commit comments

Comments
 (0)