mirror
/
turtlestitch
kopia lustrzana https://github.com/backface/turtlestitch
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

rollback variable scope patch

pull/95/head
jmoenig 2020-07-31 18:32:30 +02:00
rodzic 2e1f6c991b
commit c0bc66a153
4 zmienionych plików z 24 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
HISTORY.md
Wyświetl plik

@ -2,6 +2,12 @@
## in development:
## 6.1.1:
* rolled back scope binding change
### 2020-07-31
* rolled back scope binding change
## 6.1.0:
* **New Features:**
* fade blocks

4
snap.html
Wyświetl plik

@ -2,7 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Snap! Build Your Own Blocks 6.1.0</title>
<title>Snap! Build Your Own Blocks 6.1.1</title>
<link rel="icon" href="src/favicon.ico">
<script src="src/morphic.js?version=2020-07-23"></script>
<script src="src/symbols.js?version=2020-07-21"></script>
@ -10,7 +10,7 @@
<script src="src/blocks.js?version=2020-07-29"></script>
<script src="src/threads.js?version=2020-07-27"></script>
<script src="src/objects.js?version=2020-07-26"></script>
<script src="src/gui.js?version=2020-07-30"></script>
<script src="src/gui.js?version=2020-07-31"></script>
<script src="src/paint.js?version=2020-05-17"></script>
<script src="src/lists.js?version=2020-07-01"></script>
<script src="src/byob.js?version=2020-07-24"></script>

4
src/gui.js
Wyświetl plik

@ -78,7 +78,7 @@ Animation, BoxMorph, BlockEditorMorph, BlockDialogMorph, Note, ZERO, BLACK*/
// Global stuff ////////////////////////////////////////////////////////
modules.gui = '2020-July-30';
modules.gui = '2020-July-31';
// Declarations
@ -3971,7 +3971,7 @@ IDE_Morph.prototype.aboutSnap = function () {
module, btn1, btn2, btn3, btn4, licenseBtn, translatorsBtn,
world = this.world();
aboutTxt = 'Snap! 6.1.0\nBuild Your Own Blocks\n\n'
aboutTxt = 'Snap! 6.1.1\nBuild Your Own Blocks\n\n'
+ 'Copyright \u24B8 2008-2020 Jens M\u00F6nig and '
+ 'Brian Harvey\n'
+ 'jens@moenig.org, bh@cs.berkeley.edu\n\n'

16
src/threads.js
Wyświetl plik

@ -61,7 +61,7 @@ StageMorph, SpriteMorph, StagePrompterMorph, Note, modules, isString, copy, Map,
isNil, WatcherMorph, List, ListWatcherMorph, alert, console, TableMorph, BLACK,
TableFrameMorph, ColorSlotMorph, isSnapObject, newCanvas, Symbol, SVG_Costume*/
modules.threads = '2020-July-27';
modules.threads = '2020-July-31';
var ThreadManager;
var Process;
@ -5037,7 +5037,19 @@ Process.prototype.reportContextFor = function (context, otherObj) {
result.outerContext = copy(result.outerContext);
result.outerContext.variables = copy(result.outerContext.variables);
result.outerContext.receiver = otherObj;
result.outerContext.variables.parentFrame = otherObj.variables;
// under investigation
// the following code should be replaced by
// result.outerContext.variables.parentFrame = otherObj.variables;
if (result.outerContext.variables.parentFrame) {
result.outerContext.variables.parentFrame =
copy(result.outerContext.variables.parentFrame);
result.outerContext.variables.parentFrame.parentFrame =
otherObj.variables;
} else {
result.outerContext.variables.parentFrame = otherObj.variables;
}
}
return result;
};