reverted Cache-Control header for HTTP

b/c of CORS issues
upd4.2
jmoenig 2018-07-10 08:29:35 +02:00
rodzic 2e704af88d
commit e5c5097ff3
4 zmienionych plików z 18 dodań i 8 usunięć

8
gui.js
Wyświetl plik

@ -75,7 +75,7 @@ isRetinaSupported, SliderMorph, Animation, BoxMorph, MediaRecorder*/
// Global stuff ////////////////////////////////////////////////////////
modules.gui = '2018-July-09';
modules.gui = '2018-July-10';
// Declarations
@ -3504,7 +3504,7 @@ IDE_Morph.prototype.aboutSnap = function () {
module, btn1, btn2, btn3, btn4, licenseBtn, translatorsBtn,
world = this.world();
aboutTxt = 'Snap! 4.2.1\nBuild Your Own Blocks\n\n'
aboutTxt = 'Snap! 4.2.1.1\nBuild Your Own Blocks\n\n'
+ 'Copyright \u24B8 2018 Jens M\u00F6nig and '
+ 'Brian Harvey\n'
+ 'jens@moenig.org, bh@cs.berkeley.edu\n\n'
@ -5641,7 +5641,9 @@ IDE_Morph.prototype.getURL = function (url, callback, responseType) {
}
};
}
request.setRequestHeader('Cache-Control', 'max-age=0');
// cache-control, commented out for now
// added for Snap4Arduino but has issues with local robot servers
// request.setRequestHeader('Cache-Control', 'max-age=0');
request.send();
if (!async) {
if (request.status === 200) {

Wyświetl plik

@ -4253,3 +4253,9 @@ Translation Updates:
* Portuguese, thanks, Manuel!
* French, thanks, Nathalie and Joan!
* Spanish, Catalan and French translations of the tools library, thanks, Nathalie and Joan!
180710
------
* Threads, GUI: reverted Cache-Control header for HTTP requests b/c of CORS issues
=== v4.2.1.1 maintenance release ===

Wyświetl plik

@ -2,14 +2,14 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Snap! Build Your Own Blocks 4.2.1</title>
<title>Snap! Build Your Own Blocks 4.2.1.1</title>
<link rel="shortcut icon" href="favicon.ico">
<script type="text/javascript" src="morphic.js?version=2018-06-21"></script>
<script type="text/javascript" src="widgets.js?version=2018-06-21"></script>
<script type="text/javascript" src="blocks.js?version=2018-06-21"></script>
<script type="text/javascript" src="threads.js?version=2018-07-09"></script>
<script type="text/javascript" src="threads.js?version=2018-07-10"></script>
<script type="text/javascript" src="objects.js?version=2018-07-06"></script>
<script type="text/javascript" src="gui.js?version=2018-07-09"></script>
<script type="text/javascript" src="gui.js?version=2018-07-10"></script>
<script type="text/javascript" src="paint.js?version=2018-06-21"></script>
<script type="text/javascript" src="lists.js?version=2018-06-21"></script>
<script type="text/javascript" src="byob.js?version=2018-06-21"></script>

Wyświetl plik

@ -62,7 +62,7 @@ StageMorph, SpriteMorph, StagePrompterMorph, Note, modules, isString, copy,
isNil, WatcherMorph, List, ListWatcherMorph, alert, console, TableMorph,
TableFrameMorph, ColorSlotMorph, isSnapObject*/
modules.threads = '2018-July-09';
modules.threads = '2018-July-10';
var ThreadManager;
var Process;
@ -2302,7 +2302,9 @@ Process.prototype.reportURL = function (url) {
}
this.httpRequest = new XMLHttpRequest();
this.httpRequest.open("GET", url, true);
this.httpRequest.setRequestHeader('Cache-Control', 'max-age=0');
// cache-control, commented out for now
// added for Snap4Arduino but has issues with local robot servers
// this.httpRequest.setRequestHeader('Cache-Control', 'max-age=0');
this.httpRequest.send(null);
if (this.context.isCustomCommand) {
// special case when ignoring the result, e.g. when