pull/29/head
jmoenig 2016-12-12 09:26:25 +01:00
rodzic f7018ea16a
commit 8c03bc0995
2 zmienionych plików z 13 dodań i 2 usunięć

Wyświetl plik

@ -149,7 +149,7 @@ isSnapObject, copy, PushButtonMorph, SpriteIconMorph, Process, AlignmentMorph*/
// Global stuff //////////////////////////////////////////////////////// // Global stuff ////////////////////////////////////////////////////////
modules.blocks = '2016-December-09'; modules.blocks = '2016-December-12';
var SyntaxElementMorph; var SyntaxElementMorph;
var BlockMorph; var BlockMorph;
@ -2452,7 +2452,11 @@ BlockMorph.prototype.userMenu = function () {
if (this.parent.parentThatIsA(RingMorph)) { if (this.parent.parentThatIsA(RingMorph)) {
menu.addLine(); menu.addLine();
menu.addItem("unringify", 'unringify'); menu.addItem("unringify", 'unringify');
menu.addItem("ringify", 'ringify'); top = this.topBlock();
if (this instanceof ReporterBlockMorph ||
(!(top instanceof HatBlockMorph))) {
menu.addItem("ringify", 'ringify');
}
return menu; return menu;
} }
if (this.parent instanceof ReporterSlotMorph if (this.parent instanceof ReporterSlotMorph
@ -2587,6 +2591,9 @@ BlockMorph.prototype.ringify = function () {
this.parent.silentReplaceInput(this, ring); this.parent.silentReplaceInput(this, ring);
ring.embed(this); ring.embed(this);
} else if (top) { // command } else if (top) { // command
if (top instanceof HatBlockMorph) {
return;
}
top.parent.add(ring); top.parent.add(ring);
ring.embed(top); ring.embed(top);
ring.setCenter(center); ring.setCenter(center);

Wyświetl plik

@ -3183,6 +3183,10 @@ http://snap.berkeley.edu/run#cloud:Username=jens&ProjectName=rotation
------ ------
* Translation updates (Russian, Polish, Danish, Portuguese) * Translation updates (Russian, Polish, Danish, Portuguese)
161212
------
* fixed #1560
== v4.10 === (in development) == v4.10 === (in development)