diff --git a/blocks.js b/blocks.js index 98f82575..6fc9746f 100644 --- a/blocks.js +++ b/blocks.js @@ -149,7 +149,7 @@ isSnapObject, copy, PushButtonMorph, SpriteIconMorph, Process, AlignmentMorph*/ // Global stuff //////////////////////////////////////////////////////// -modules.blocks = '2016-December-09'; +modules.blocks = '2016-December-12'; var SyntaxElementMorph; var BlockMorph; @@ -2452,7 +2452,11 @@ BlockMorph.prototype.userMenu = function () { if (this.parent.parentThatIsA(RingMorph)) { menu.addLine(); menu.addItem("unringify", 'unringify'); - menu.addItem("ringify", 'ringify'); + top = this.topBlock(); + if (this instanceof ReporterBlockMorph || + (!(top instanceof HatBlockMorph))) { + menu.addItem("ringify", 'ringify'); + } return menu; } if (this.parent instanceof ReporterSlotMorph @@ -2587,6 +2591,9 @@ BlockMorph.prototype.ringify = function () { this.parent.silentReplaceInput(this, ring); ring.embed(this); } else if (top) { // command + if (top instanceof HatBlockMorph) { + return; + } top.parent.add(ring); ring.embed(top); ring.setCenter(center); diff --git a/history.txt b/history.txt index f9cabcc8..f2931db5 100755 --- a/history.txt +++ b/history.txt @@ -3183,6 +3183,10 @@ http://snap.berkeley.edu/run#cloud:Username=jens&ProjectName=rotation ------ * Translation updates (Russian, Polish, Danish, Portuguese) +161212 +------ +* fixed #1560 + == v4.10 === (in development)