pull/3/merge
jmoenig 2014-11-24 10:43:53 +01:00
rodzic 927448d7ab
commit 0d8cc567e7
2 zmienionych plików z 4 dodań i 4 usunięć

Wyświetl plik

@ -2346,4 +2346,4 @@ ______
-------
* Threads: Fixed #318
* Objects: Fixed #416
* Objects: Fixed #372

Wyświetl plik

@ -2170,8 +2170,8 @@ SpriteMorph.prototype.freshPalette = function (category) {
var defs = SpriteMorph.prototype.blocks,
hiddens = StageMorph.prototype.hiddenPrimitives;
return Object.keys(hiddens).some(function (any) {
return defs[any].category === category ||
contains((more[category] || []), any);
return !isNil(defs[any]) && (defs[any].category === category
|| contains((more[category] || []), any));
});
}
@ -2210,7 +2210,7 @@ SpriteMorph.prototype.freshPalette = function (category) {
var hiddens = StageMorph.prototype.hiddenPrimitives,
defs = SpriteMorph.prototype.blocks;
Object.keys(hiddens).forEach(function (sel) {
if (defs[sel].category === category) {
if (defs[sel] && (defs[sel].category === category)) {
delete StageMorph.prototype.hiddenPrimitives[sel];
}
});