From ffcffd66362cda2fb76b58f3eecc7afff1853308 Mon Sep 17 00:00:00 2001
From: jmoenig <jens@moenig.org>
Date: Thu, 4 Jun 2020 11:16:19 +0200
Subject: [PATCH] added regular "result pic..." entry to reporter block context
 menu

---
 snap.html     |  2 +-
 src/blocks.js | 31 +++++++++++++------------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/snap.html b/snap.html
index 58d0ef3c..caca4adc 100755
--- a/snap.html
+++ b/snap.html
@@ -7,7 +7,7 @@
         <script type="text/javascript" src="src/morphic.js?version=2020-06-01"></script>
         <script type="text/javascript" src="src/symbols.js?version=2020-05-28"></script>
         <script type="text/javascript" src="src/widgets.js?version=2020-05-06"></script>
-        <script type="text/javascript" src="src/blocks.js?version=2020-05-28"></script>
+        <script type="text/javascript" src="src/blocks.js?version=2020-06-04"></script>
         <script type="text/javascript" src="src/threads.js?version=2020-05-30"></script>
         <script type="text/javascript" src="src/objects.js?version=2020-05-18"></script>
         <script type="text/javascript" src="src/gui.js?version=2020-06-01"></script>
diff --git a/src/blocks.js b/src/blocks.js
index abf47fa9..fddfc9d8 100644
--- a/src/blocks.js
+++ b/src/blocks.js
@@ -148,7 +148,7 @@ CustomCommandBlockMorph, SymbolMorph, ToggleButtonMorph, DialMorph*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.blocks = '2020-May-28';
+modules.blocks = '2020-June-04';
 
 var SyntaxElementMorph;
 var BlockMorph;
@@ -2617,12 +2617,12 @@ BlockMorph.prototype.userMenu = function () {
         myself = this,
         shiftClicked = world.currentKey === 16,
         proc = this.activeProcess(),
+        top = this.topBlock(),
         vNames = proc && proc.context && proc.context.outerContext ?
                 proc.context.outerContext.variables.names() : [],
         alternatives,
         field,
-        rcvr,
-        top;
+        rcvr;
 
     function addOption(label, toggle, test, onHint, offHint) {
         menu.addItem(
@@ -2661,18 +2661,6 @@ BlockMorph.prototype.userMenu = function () {
         "help...",
         'showHelp'
     );
-    if (shiftClicked) {
-        top = this.topBlock();
-        if (top instanceof ReporterBlockMorph) {
-            menu.addItem(
-                "script pic with result...",
-                () => top.exportResultPic(),
-                'open a new window\n' +
-                    'with a picture of both\nthis script and its result',
-                new Color(100, 0, 0)
-            );
-        }
-    }
     if (this.isTemplate) {
         if (this.parent instanceof SyntaxElementMorph) { // in-line
             if (this.selector === 'reportGetVar') { // script var definition
@@ -2925,13 +2913,21 @@ BlockMorph.prototype.userMenu = function () {
                     IDE_Morph
             );
             ide.saveCanvasAs(
-                this.topBlock().scriptPic(),
+                top.scriptPic(),
                 (ide.projectName || localize('untitled')) + ' ' +
                     localize('script pic')
             );
         },
         'open a new window\nwith a picture of this script'
     );
+    if (top instanceof ReporterBlockMorph) {
+        menu.addItem(
+            "result pic...",
+            () => top.exportResultPic(),
+            'open a new window\n' +
+                'with a picture of both\nthis script and its result'
+        );
+    }
     if (shiftClicked) {
         menu.addItem(
             'download script',
@@ -2975,7 +2971,6 @@ BlockMorph.prototype.userMenu = function () {
     if (this.parent.parentThatIsA(RingMorph)) {
         menu.addLine();
         menu.addItem("unringify", 'unringify');
-        top = this.topBlock();
         if (this instanceof ReporterBlockMorph ||
                 (!(top instanceof HatBlockMorph))) {
             menu.addItem("ringify", 'ringify');
@@ -2986,7 +2981,7 @@ BlockMorph.prototype.userMenu = function () {
             || (this.parent instanceof CommandSlotMorph)
             || (this instanceof HatBlockMorph)
             || (this instanceof CommandBlockMorph
-                && (this.topBlock() instanceof HatBlockMorph))) {
+                && (top instanceof HatBlockMorph))) {
         return menu;
     }
     menu.addLine();