Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update playground to load blocks in iframe instead of custom sandbox #7241

Merged
merged 9 commits into from Jun 25, 2020
Merged

Update playground to load blocks in iframe instead of custom sandbox #7241

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ea90ef8
Update playground to use iframe with released and beta targets
shakao Jun 23, 2020
d03b44a
Use existing importproject command
shakao Jun 23, 2020
9f57ac1
Clean up unused files
shakao Jun 23, 2020
a139d60
Update relative links
shakao Jun 23, 2020
c53ae08
Update docs/static/playground/playground.ts
shakao Jun 24, 2020
d03e2cc
Whitespace fixes, remove extra pxtweb reference
shakao Jun 24, 2020
41f002c
Small CSS update to margins
shakao Jun 24, 2020
4fe1401
Additional CSS updates to buttons, labelled inputs, etc
shakao Jun 24, 2020
7140a88
Rename custom.ts, remove ws=mem (covered by controller=1)
shakao Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion docfiles/playground-apptrackingweb.html
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions docfiles/playground-head.html
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions docfiles/playground-workers.html
View file
Open in desktop

This file was deleted.

210 changes: 0 additions & 210 deletions docs/playground-runner.html
View file
Open in desktop

This file was deleted.

85 changes: 39 additions & 46 deletions docs/playground.html
View file
Open in desktop
@@ -1,70 +1,63 @@
<!DOCTYPE html>
<html lang="en">
<html>

<head>
<meta charset="UTF-8">
<title>MakeCode Playground</title>
<meta name="Description" content="@description@" />

<!-- @include playground-head.html -->

<link data-inline="yes-please" href="/static/playground/spinner.css" rel="stylesheet" />
<link data-inline="yes-please" href="/static/playground/playground.css" rel="stylesheet" />

<link data-name="vs/editor/editor.main" rel="stylesheet" href="https://microsoft.github.io/monaco-editor/node_modules/monaco-editor/min/vs/editor/editor.main.css">
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
<link rel="stylesheet" href="https://pxt.azureedge.net/blob/2163189fd5e35c0981ed55318415582a7c9aeb12/doccdn/semantic.css" type="text/css">
<link data-name="vs/editor/editor.main" rel="stylesheet"
href="https://microsoft.github.io/monaco-editor/node_modules/monaco-editor/min/vs/editor/editor.main.css">
<link rel="stylesheet" href="/static/shared/iframeeditor.css">
<link rel="stylesheet" href="/static/playground/playground.css">
</head>

<body class="playground-page">
<pre data-preload="/playground/samples/basic/hello-world/sample.ts"></pre>

<body>
<nav class="ui menu inverted fixed borderless">
<div class="menu left">
<div class="ui item">
MakeCode Playground
MakeCode Blocks Playground
</div>
</div>

<div class="menu right">
<a href="/docs" class="ui item">
Home
</a>
<a href="/playground" class="ui item">
Playground
</a>
<a href="/defining-blocks" class="ui item">
Help defining blocks
</a>
<a href="https://github.com/microsoft/pxt-sample" class="ui item" style="background-color:black">
Sample target
<a href="/defining-blocks" target="_blank" class="ui item">
Defining Blocks
</a>
</div>
</nav>
<div id="loading">
<div class="spinner">
<div class="rect1"></div>
<div class="rect2"></div>
<div class="rect3"></div>
<div class="rect4"></div>
<div class="rect5"></div>

<div class="content">
<div class="input-row">
<div id="sample-container" class="ui action input">
<button class="ui small primary labelled icon left attached button" id="run-button">
<i class="play icon"></i>
Run
</button>
<select id="sample-select" class="ui dropdown"></select>
</div>
<div id="run-container" class="ui action input">
<select id="endpoint-select" class="ui dropdown"></select>
</div>
</div>
<div class="editor-row">
<div id="monaco-editor">
<div id="container" style="border:1px solid grey"></div>
</div>
<div id="makecode-editor" style="border:1px solid grey"></div>
</div>
</div>

<section id="playground">
</section>

<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.9.1/jquery.min.js" integrity="sha256-wS9gmOZBqsqWxgIVgA8Y9WcQOa7PgSIX+rPA0VL2rbQ="
crossorigin="anonymous"></script>
<!-- @include tracking.html -->
riknoll marked this conversation as resolved.
Show resolved Hide resolved
<!-- @include thin-footer.html -->

<!-- @include playground-apptrackingweb.html -->
<!-- @include apptracking.html -->
<!-- @include thin-footer.html -->
<script>var require = { paths: { 'vs': 'https://microsoft.github.io/monaco-editor/node_modules/monaco-editor/min/vs' } };</script>
<script src="https://microsoft.github.io/monaco-editor/node_modules/monaco-editor/min/vs/loader.js"></script>
<script src="https://microsoft.github.io/monaco-editor/node_modules/monaco-editor/min/vs/editor/editor.main.nls.js"></script>
<script src="https://microsoft.github.io/monaco-editor/node_modules/monaco-editor/min/vs/editor/editor.main.js"></script>
<script
src="https://microsoft.github.io/monaco-editor/node_modules/monaco-editor/min/vs/editor/editor.main.nls.js"></script>
<script
src="https://microsoft.github.io/monaco-editor/node_modules/monaco-editor/min/vs/editor/editor.main.js"></script>
<script src="/static/playground/samples/all.js"></script>
<script src="/static/playground/playground.js"></script>

<script data-inline="yes-please" src="/static/playground/samples/all.js" type="text/javascript"></script>
<script data-inline="yes-please" src="/static/playground/playground.js" type="text/javascript"></script>
</body>

</html>
Binary file removed docs/static/playground/blockly/media/1x1.gif
View file
Open in desktop
Binary file not shown.