Skip to content

Commit d5a8db6

Browse files
pgbovinepgbovine
committed
added error message for https execution of non-python code
1 parent 3b685b8 commit d5a8db6

20 files changed

+63
-13
lines changed

‎v5-unity/build/composingprograms.bundle.js

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎v5-unity/build/csc108h.bundle.js

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎v5-unity/build/iframe-embed.bundle.js

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎v5-unity/build/opt-live.bundle.js

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎v5-unity/build/recorder.bundle.js

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎v5-unity/build/visualize.bundle.js

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎v5-unity/c.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<!-- let Webpack take care of everything. Use the [hash] feature to
2121
create unique filenames for releases:
2222
https://webpack.github.io/docs/long-term-caching.html -->
23-
<script type="text/javascript" src="build/visualize.bundle.js?87d7f50a06" charset="utf-8"></script>
23+
<script type="text/javascript" src="build/visualize.bundle.js?192ea30095" charset="utf-8"></script>
2424

2525
<!-- insert google-analytics.txt contents here -->
2626

‎v5-unity/composingprograms.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<title>Online Python Tutor - Composing Programs - Python 3</title>
1212

1313
<meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
14-
<script type="text/javascript" src="build/composingprograms.bundle.js?b095e7d1ed" charset="utf-8"></script>
14+
<script type="text/javascript" src="build/composingprograms.bundle.js?a52e5fe4b3" charset="utf-8"></script>
1515

1616
<!-- insert google-analytics.txt contents here -->
1717

‎v5-unity/cpp.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<!-- let Webpack take care of everything. Use the [hash] feature to
2121
create unique filenames for releases:
2222
https://webpack.github.io/docs/long-term-caching.html -->
23-
<script type="text/javascript" src="build/visualize.bundle.js?87d7f50a06" charset="utf-8"></script>
23+
<script type="text/javascript" src="build/visualize.bundle.js?192ea30095" charset="utf-8"></script>
2424

2525
<!-- insert google-analytics.txt contents here -->
2626

‎v5-unity/csc108h.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<title>Online Python Tutor - csc108h</title>
1212

1313
<meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
14-
<script type="text/javascript" src="build/csc108h.bundle.js?13d003b948" charset="utf-8"></script>
14+
<script type="text/javascript" src="build/csc108h.bundle.js?f3025c7813" charset="utf-8"></script>
1515

1616
<!-- insert google-analytics.txt contents here -->
1717

‎v5-unity/csc108h_shared.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<title>Online Python Tutor - csc108h with shared sessions</title>
1212

1313
<meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
14-
<script type="text/javascript" src="build/csc108h.bundle.js?13d003b948" charset="utf-8"></script>
14+
<script type="text/javascript" src="build/csc108h.bundle.js?f3025c7813" charset="utf-8"></script>
1515

1616
<!-- insert google-analytics.txt contents here -->
1717

‎v5-unity/iframe-embed.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!-- let Webpack take care of everything. Use the [hash] feature to
88
create unique filenames for releases:
99
https://webpack.github.io/docs/long-term-caching.html -->
10-
<script type="text/javascript" src="build/iframe-embed.bundle.js?37385cce14" charset="utf-8"></script>
10+
<script type="text/javascript" src="build/iframe-embed.bundle.js?ffce77cafd" charset="utf-8"></script>
1111

1212
</head>
1313

‎v5-unity/java.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<!-- let Webpack take care of everything. Use the [hash] feature to
2121
create unique filenames for releases:
2222
https://webpack.github.io/docs/long-term-caching.html -->
23-
<script type="text/javascript" src="build/visualize.bundle.js?87d7f50a06" charset="utf-8"></script>
23+
<script type="text/javascript" src="build/visualize.bundle.js?192ea30095" charset="utf-8"></script>
2424

2525
<!-- insert google-analytics.txt contents here -->
2626

‎v5-unity/javascript.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<!-- let Webpack take care of everything. Use the [hash] feature to
2121
create unique filenames for releases:
2222
https://webpack.github.io/docs/long-term-caching.html -->
23-
<script type="text/javascript" src="build/visualize.bundle.js?87d7f50a06" charset="utf-8"></script>
23+
<script type="text/javascript" src="build/visualize.bundle.js?192ea30095" charset="utf-8"></script>
2424

2525
<!-- insert google-analytics.txt contents here -->
2626

‎v5-unity/js/opt-frontend-common.ts

+8
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ export abstract class AbstractBaseFrontend {
9292
'http://cokapi.com/'; // try cokapi.com so that hopefully it works through firewalls better than directly using IP addr
9393

9494
backupHttpServerRoot = 'http://45.33.41.179/'; // this is my backup server in case the primary is too busy
95+
// TODO: add more backup servers and randomly load-balance as necessary in the future
9596

9697
// see ../../v4-cokapi/cokapi.js for details
9798
langSettingToJsonpEndpoint = {
@@ -442,6 +443,13 @@ export abstract class AbstractBaseFrontend {
442443
if (jsonp_endpoint) {
443444
assert (pyState !== '2' && pyState !== '3');
444445

446+
// 2018-08-19: this is an uncommon use case (only used for https iframe embedding)
447+
if (jsonp_endpoint.indexOf('https:') == 0) {
448+
this.setFronendError(["Error: https execution of non-Python code is not currently supported. [#nonPythonHttps]"]);
449+
this.doneExecutingCode();
450+
return;
451+
}
452+
445453
var retryOnBackupServer = () => {
446454
// first log a #TryBackup error entry:
447455
this.setFronendError(["Main server is busy or has errors; re-trying using backup server ... [#TryBackup]"]);

‎v5-unity/live.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<!-- let Webpack take care of everything. Use the [hash] feature to
1717
create unique filenames for releases:
1818
https://webpack.github.io/docs/long-term-caching.html -->
19-
<script type="text/javascript" src="build/opt-live.bundle.js?e0ac3d7c38" charset="utf-8"></script>
19+
<script type="text/javascript" src="build/opt-live.bundle.js?d0978d2491" charset="utf-8"></script>
2020

2121
<!-- insert google-analytics.txt contents here -->
2222

‎v5-unity/recorder.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<!-- let Webpack take care of everything. Use the [hash] feature to
1616
create unique filenames for releases:
1717
https://webpack.github.io/docs/long-term-caching.html -->
18-
<script type="text/javascript" src="build/recorder.bundle.js?6a452af436" charset="utf-8"></script>
18+
<script type="text/javascript" src="build/recorder.bundle.js?b7e91fa7f1" charset="utf-8"></script>
1919

2020
<!-- insert google-analytics.txt contents here -->
2121

‎v5-unity/ruby.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<!-- let Webpack take care of everything. Use the [hash] feature to
2121
create unique filenames for releases:
2222
https://webpack.github.io/docs/long-term-caching.html -->
23-
<script type="text/javascript" src="build/visualize.bundle.js?87d7f50a06" charset="utf-8"></script>
23+
<script type="text/javascript" src="build/visualize.bundle.js?192ea30095" charset="utf-8"></script>
2424

2525
<!-- insert google-analytics.txt contents here -->
2626

‎v5-unity/typescript.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<!-- let Webpack take care of everything. Use the [hash] feature to
2121
create unique filenames for releases:
2222
https://webpack.github.io/docs/long-term-caching.html -->
23-
<script type="text/javascript" src="build/visualize.bundle.js?87d7f50a06" charset="utf-8"></script>
23+
<script type="text/javascript" src="build/visualize.bundle.js?192ea30095" charset="utf-8"></script>
2424

2525
<!-- insert google-analytics.txt contents here -->
2626

‎v5-unity/visualize.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<!-- let Webpack take care of everything. Use the [hash] feature to
1616
create unique filenames for releases:
1717
https://webpack.github.io/docs/long-term-caching.html -->
18-
<script type="text/javascript" src="build/visualize.bundle.js?87d7f50a06" charset="utf-8"></script>
18+
<script type="text/javascript" src="build/visualize.bundle.js?192ea30095" charset="utf-8"></script>
1919

2020
<!-- insert google-analytics.txt contents here -->
2121

0 commit comments

Comments
 (0)