summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmoenig <jens@moenig.org>2014-11-24 10:43:53 +0100
committerjmoenig <jens@moenig.org>2014-11-24 10:43:53 +0100
commit0d8cc567e7f04a9416fc2518646f2d9187840d70 (patch)
treeec7153c1c19170f469fbe6be3c03ed752b9302b1
parent927448d7ab4f7069661eb73018463fbf0e40651a (diff)
downloadsnap-0d8cc567e7f04a9416fc2518646f2d9187840d70.tar.gz
snap-0d8cc567e7f04a9416fc2518646f2d9187840d70.zip
Fixed #372
-rwxr-xr-xhistory.txt2
-rw-r--r--objects.js6
2 files changed, 4 insertions, 4 deletions
diff --git a/history.txt b/history.txt
index 9d977ad..2d7e53e 100755
--- a/history.txt
+++ b/history.txt
@@ -2346,4 +2346,4 @@ ______
-------
* Threads: Fixed #318
* Objects: Fixed #416
-
+* Objects: Fixed #372
diff --git a/objects.js b/objects.js
index 3b2c07b..69376c8 100644
--- a/objects.js
+++ b/objects.js
@@ -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];
}
});