pull/89/head
jmoenig 2019-06-04 00:16:51 +02:00
rodzic 82c6a653c4
commit 4e25814da2
4 zmienionych plików z 19 dodań i 9 usunięć

Wyświetl plik

@ -86,6 +86,9 @@
* German
* French
### 2019-06-04
* Objects, Lists: fixed #682
### 2019-06-03
* Threads: fixed #2249, predicates inside generic WHEN hats should be able to pass upvars
* Blocks: fixed #1740

Wyświetl plik

@ -8,10 +8,10 @@
<script type="text/javascript" src="src/widgets.js?version=2019-04-05"></script>
<script type="text/javascript" src="src/blocks.js?version=2019-06-03_1"></script>
<script type="text/javascript" src="src/threads.js?version=2019-06-03"></script>
<script type="text/javascript" src="src/objects.js?version=2019-06-02"></script>
<script type="text/javascript" src="src/objects.js?version=2019-06-04"></script>
<script type="text/javascript" src="src/gui.js?version=2019-05-29"></script>
<script type="text/javascript" src="src/paint.js?version=2019-02-22"></script>
<script type="text/javascript" src="src/lists.js?version=2019-04-27"></script>
<script type="text/javascript" src="src/lists.js?version=2019-06-04"></script>
<script type="text/javascript" src="src/byob.js?version=2019-02-15"></script>
<script type="text/javascript" src="src/tables.js?version=2019-02-07"></script>
<script type="text/javascript" src="src/symbols.js?version=2019-03-07"></script>

Wyświetl plik

@ -60,9 +60,9 @@
Color, Point, WatcherMorph, StringMorph, SpriteMorph, ScrollFrameMorph,
CellMorph, ArrowMorph, MenuMorph, snapEquals, Morph, isNil, localize, isString,
MorphicPreferences, TableDialogMorph, SpriteBubbleMorph, SpeechBubbleMorph,
TableFrameMorph, TableMorph, Variable, isSnapObject*/
TableFrameMorph, TableMorph, Variable, isSnapObject, Costume*/
modules.lists = '2019-April-27';
modules.lists = '2019-June-04';
var List;
var ListWatcherMorph;
@ -677,12 +677,12 @@ ListWatcherMorph.prototype.init = function (list, parentCell) {
ListWatcherMorph.prototype.update = function (anyway) {
var i, idx, ceil, morphs, cell, cnts, label, button, max,
starttime, maxtime = 1000;
this.frame.contents.children.forEach(function (m) {
if (m instanceof CellMorph) {
if (m.contentsMorph instanceof ListWatcherMorph) {
m.contentsMorph.update();
} else if (isSnapObject(m.contents)) {
} else if (isSnapObject(m.contents) ||
(m.contents instanceof Costume)) {
m.update();
}
}

Wyświetl plik

@ -84,7 +84,7 @@ BlockEditorMorph, BlockDialogMorph, PrototypeHatBlockMorph, localize,
TableMorph, TableFrameMorph, normalizeCanvas, BooleanSlotMorph, HandleMorph,
AlignmentMorph, Process, XML_Element, VectorPaintEditorMorph, WorldMap*/
modules.objects = '2019-June-02';
modules.objects = '2019-June-04';
var SpriteMorph;
var StageMorph;
@ -10381,11 +10381,12 @@ CellMorph.prototype.fixLayout = function () {
CellMorph.prototype.update = function () {
// special case for observing sprites
if (!isSnapObject(this.contents)) {
if (!isSnapObject(this.contents) && !(this.contents instanceof Costume)) {
return;
}
if (this.version !== this.contents.version) {
this.drawNew();
this.version = this.contents.version;
}
};
@ -10836,7 +10837,8 @@ WatcherMorph.prototype.update = function () {
}
}
if (newValue !== this.currentValue ||
isInherited !== this.isGhosted) {
isInherited !== this.isGhosted ||
(newValue.version && (newValue.version !== this.version))) {
this.changed();
this.cellMorph.contents = newValue;
this.isGhosted = isInherited;
@ -10853,6 +10855,11 @@ WatcherMorph.prototype.update = function () {
this.sliderMorph.drawNew();
}
this.fixLayout();
if (this.currentValue && this.currentValue.version) {
this.version = this.currentValue.version;
} else {
this.version = Date.now();
}
this.currentValue = newValue;
}
}