Merge pull request #1417 from brollb/unringify-ring

Added check that parent is RingMorph. Fixes #1416
dev
Jens Mönig 2016-10-16 17:29:31 +02:00 zatwierdzone przez GitHub
commit 1e4bb8a3ec
1 zmienionych plików z 2 dodań i 2 usunięć

Wyświetl plik

@ -2445,7 +2445,7 @@ BlockMorph.prototype.userMenu = function () {
}
return menu;
}
if (this.parentThatIsA(RingMorph)) {
if (this.parent.parentThatIsA(RingMorph)) {
menu.addLine();
menu.addItem("unringify", 'unringify');
menu.addItem("ringify", 'ringify');
@ -2598,7 +2598,7 @@ BlockMorph.prototype.ringify = function () {
BlockMorph.prototype.unringify = function () {
// remove a Ring around me, if any
var ring = this.parentThatIsA(RingMorph),
var ring = this.parent.parentThatIsA(RingMorph),
top = this.topBlock(),
scripts = this.parentThatIsA(ScriptsMorph),
block,