Skip to content

Commit 9bc5f45

Browse files
ali-hamudali-hamud
committed
Merge remote-tracking branch 'powerbi/master'
2 parents 7211b6e + db4ab98 commit 9bc5f45

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+3163
-1522
lines changed

‎demo/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"fetch": "^1.0.0",
3636
"http-server": "^0.10.0",
3737
"jquery": "^3.1.0",
38-
"powerbi-client": "2.4.5",
38+
"powerbi-client": "2.5.0",
3939
"syntaxhighlighter": "4.0.1"
4040
},
4141
"devDependencies": {}

‎demo/v2-demo/anyReport.html

-52
This file was deleted.

‎demo/v2-demo/code_area.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<button id="btnRunCode" class="textAreaControl">
55
<img src="images\run.png" /> Run
66
</button>
7-
<button id="btnCopyCode" class="textAreaControl" onclick="CopyCode();">
7+
<button id="btnCopyCode" class="textAreaControl" onclick="elementClicked(this);CopyCode();">
88
<img src="images\copy.png" /> Copy
99
</button>
1010
</div>

‎demo/v2-demo/demos.html

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<div>
2+
<h2>Demos</h2>
3+
</div>

‎demo/v2-demo/docs.html

+50-24
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,52 @@
1-
<div>
2-
<div class="title">
3-
<h2>Getting Started</h2>
1+
<div id="docs-section">
2+
<div id="docs-content">
3+
<div class="docs-line">
4+
<div class="docs-links">
5+
<h2>Getting Started</h2>
6+
<a href="https://github.com/Microsoft/powerbi-javascript/wiki">Power BI JavaScript API wiki</a><br>
7+
<a href="https://docs.microsoft.com/en-us/power-bi/developer/embedding">Power BI Embedding Documentation</a><br>
8+
</div>
9+
<div class="docs-links">
10+
<h2>Useful Links</h2>
11+
<a href="https://azure.microsoft.com/en-us/services/power-bi-embedded/">Power BI Embedded on Azure</a><br>
12+
<a href="https://community.powerbi.com/t5/Forums/ct-p/Forums">Power BI Community</a><br>
13+
<a href="https://ideas.powerbi.com/forums/265200-power-bi-ideas/category/161718-apis-and-embedding">Power BI Ideas - APIs and Embedding</a><br>
14+
</div>
15+
<div class="docs-links">
16+
<h2>Support</h2>
17+
<a href="https://docs.microsoft.com/en-us/power-bi/developer/embedded-faq">Power BI Embedded FAQ</a><br>
18+
<a href="https://docs.microsoft.com/en-us/power-bi/developer/embedded-troubleshoot">Power BI Embedded Troubleshooting</a><br>
19+
<a href="https://powerbi.microsoft.com/en-us/support/">Power BI Support</a><br>
20+
</div>
21+
</div>
22+
<div class="docs-line">
23+
<h2>Videos</h2>
24+
<div class="docs-video">
25+
What is Power BI Embedded<br>
26+
<iframe width="330" height="186" src="https://www.youtube.com/embed/iEHfUuoZseo" frameborder="0" allow="encrypted-media" allowfullscreen></iframe>
27+
</div>
28+
<div class="docs-video">
29+
Microsoft Power BI Embedded update<br>
30+
<iframe width="330" height="186" src="https://www.youtube.com/embed/NbsLRDMWNRI" frameborder="0" allow="encrypted-media" allowfullscreen></iframe>
31+
</div>
32+
<div class="docs-video">
33+
Get an Embed Token & Embed Your Analytics<br>
34+
<iframe width="330" height="186" src="https://www.youtube.com/embed/GPHHdDRSlis" frameborder="0" allow="encrypted-media" allowfullscreen></iframe>
35+
</div>
36+
<div class="docs-video">
37+
Setting up and Getting Started<br>
38+
<video width="330" height="186" controls="controls" preload="metadata">
39+
<source src="https://sec.ch9.ms/ch9/5da0/29725d07-f7c3-4090-8b80-a5881e5d5da0/PowerBiEmbeddedPart1_high.mp4#t=12.6" type="video/mp4">
40+
Your browser does not support the video tag.
41+
</video>
42+
</div>
43+
<div class="docs-video">
44+
Power BI Embedded JavaScript SDK<br>
45+
<video width="330" height="186" controls="controls" preload="metadata">
46+
<source src="https://sec.ch9.ms/ch9/1750/ada209d0-c8a3-41d3-832d-1eac7e3c1750/PowerBiEmbeddedPart2_high.mp4#t=12.6" type="video/mp4">
47+
Your browser does not support the video tag.
48+
</video>
49+
</div>
50+
</div>
451
</div>
5-
<div>
6-
Please visit our
7-
<a href="https://powerbi.microsoft.com/en-us/documentation/powerbi-developer-embedding/">documentation</a>
8-
to start using Power BI Embedded.
9-
</div>
10-
</div>
11-
12-
<h2>Videos</h2>
13-
14-
<div>
15-
<div class="title">
16-
1. Learn how to Embed and Interact with Power BI Reports.
17-
</div>
18-
<iframe class="video" src="https://www.youtube.com/embed/nfkVljh_9O4" frameborder="0" allowfullscreen></iframe>
19-
</div>
20-
21-
<div>
22-
<div class="title">
23-
2. Learn how to Create, Edit and Save Power BI reports in Embedded view.
24-
</div>
25-
<iframe class="video" src="https://www.youtube.com/embed/ibuN4DzCl5c?showinfo=0" frameborder="0" allowfullscreen></iframe>
2652
</div>

‎demo/v2-demo/images/arrow.png

-602 Bytes
Binary file not shown.

‎demo/v2-demo/images/arrow_flipped.png

-665 Bytes
Binary file not shown.

‎demo/v2-demo/images/clear.png

-847 Bytes
Loading

‎demo/v2-demo/images/collapse.svg

+45
Loading

‎demo/v2-demo/images/copy.png

-1.24 KB
Loading

‎demo/v2-demo/images/expand.svg

+57
Loading

‎demo/v2-demo/images/info.png

-3.04 KB
Binary file not shown.

‎demo/v2-demo/images/info.svg

+29
Loading

‎demo/v2-demo/images/pc.png

226 Bytes
Loading

‎demo/v2-demo/images/phone.png

305 Bytes
Loading

‎demo/v2-demo/images/run.png

-1.04 KB
Loading

‎demo/v2-demo/images/sampledashboard.png

120 KB
Loading

‎demo/v2-demo/images/sampleqna.png

59.2 KB
Loading

‎demo/v2-demo/images/samplereport.png

319 KB
Loading

‎demo/v2-demo/images/sampletile.png

18.2 KB
Loading

‎demo/v2-demo/images/samplevisual.png

20.4 KB
Loading

‎demo/v2-demo/index.html

+27-23
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,37 @@
1515

1616
<body>
1717
<header>
18-
<div id="navbar">
19-
<div class="logo-text">
20-
<div class="logo-text-span">Microsoft Power BI Embedded Sample</div>
21-
</div>
22-
<div id="top-nav-bar">
23-
<div id="top-ul-dev">
24-
<ul id="top-ul" class="top-ul">
25-
<li id="top-sample" class="top-li-active" onclick="OpenSampleSection();">
26-
<div><a href="#">Sample</a></div>
27-
</li>
28-
<li id="top-docs" onclick="OpenDocumentationSection();">
29-
<div><a href="#">Documentation</a></div>
30-
</li>
31-
</ul>
32-
</div>
33-
</div>
18+
<div class="logo-text">
19+
<div class="logo-text-span">Microsoft Power BI Embedded Playground</div>
3420
</div>
3521
</header>
36-
37-
<div id="contentWrapper">
38-
<div id ="sampleContent" class="content">
22+
<div id="navbar-content">
23+
<div id="navbar">
24+
<div id="main-nav-bar">
25+
<div id="main-ul-dev">
26+
<ul id="main-ul" class="main-ul">
27+
<li id="main-sample" class="main-li-active" onclick="OpenSampleSection();">
28+
<div><a href="#">Sample tool</a></div>
29+
</li>
30+
<li id="main-demos" class="main-li-active" onclick="OpenDemosSection();" style="display: none;">
31+
<div><a href="#">Demos</a></div>
32+
</li>
33+
<li id="main-docs" onclick="OpenDocumentationSection();">
34+
<div><a href="#">Documentation</a></div>
35+
</li>
36+
</ul>
37+
</div>
38+
</div>
3939
</div>
40+
<div id="contentWrapper">
41+
<div id ="sampleContent" class="content">
42+
</div>
4043

41-
<div id ="documentationContent" class="content">
42-
</div>
44+
<div id ="demosContent" class="content">
45+
</div>
4346

44-
<div id ="anyReportContent" class="content">
47+
<div id ="documentationContent" class="content">
48+
</div>
4549
</div>
4650
</div>
4751

@@ -59,7 +63,7 @@
5963

6064
<script src="scripts/report.js"></script>
6165

62-
<script src="scripts/step_authorize.js"></script>
66+
<script src="scripts/step_samples.js"></script>
6367
<script src="scripts/step_embed.js"></script>
6468
<script src="scripts/step_interact.js"></script>
6569

‎demo/v2-demo/log_window.html

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
<div id="response" class="responseDiv">
2-
<div class="editorTitle">Log Viewer</div>
2+
<div class="editorTitle">Log</div>
33
<div class="textAreaControls">
4-
<button id="btnCopyResponse" class="textAreaControl" onclick="CopyResponseWindow();">
4+
<button id="btnCopyResponse" class="textAreaControl" onclick="elementClicked(this);CopyResponseWindow();">
55
<img src="images\copy.png"/> Copy
66
</button>
7-
<button id="btnClearResponse" class="textAreaControl" onclick="ClearTextArea('#txtResponse');">
7+
<button id="btnClearResponse" class="textAreaControl" onclick="elementClicked(this);ClearTextArea('#txtResponse');">
88
<img src="images\clear.png"/> Clear
99
</button>
1010
</div>
11-
<textarea id="txtResponse" class="responseTextArea" />
11+
<div class="responseTextAreaWrapper">
12+
<textarea id="txtResponse" class="responseTextArea" />
13+
</div>
1214
</div>

0 commit comments

Comments
 (0)