prepared v7.3.1 emergency patch

jmoenig · Mar 16, 2022 · 14f9b33 · 14f9b33
1 parent e7b1217
commit 14f9b33
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 20 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -8,16 +8,20 @@
 * **Notable Changes:**
     * moved "append", "reshape", "combinations" blocks down one group in the palette
 * **Notable Fixes:**
-    * guard against broken SVG costumes when loading a project
     * fixed an edge case for slot type inferral
     * fixed variadic AND/OR reporters library, thanks, Brian!
 * **Documentation Updates:**
 * **Translation Updates:**
     * German
 
+## 7.3.1:
+* **Notable Fix:**
+    * guard against broken SVG costumes when loading a project
+
 ### 2022-03-16
 * objects, threads: reformulated the zero-costume-width fix addressing a costume-loading issue
 * German translation update for new error message
+* prepared v7.3.1 emergency patch
 
 ### 2022-03-15
 * blocks, store, gui: deserialize new format for exported scripts

diff --git a/snap.html b/snap.html
@@ -20,7 +20,7 @@
         <script src="src/threads.js?version=2022-03-16"></script>
         <script src="src/objects.js?version=2022-03-16"></script>
         <script src="src/scenes.js?version=2022-03-03"></script>
-        <script src="src/gui.js?version=2022-03-15"></script>
+        <script src="src/gui.js?version=2022-03-16"></script>
         <script src="src/paint.js?version=2021-07-05"></script>
         <script src="src/lists.js?version=2022-02-07"></script>
         <script src="src/byob.js?version=2022-03-14"></script>

diff --git a/src/blocks.js b/src/blocks.js
@@ -161,7 +161,7 @@ CostumeIconMorph, SoundIconMorph, SVG_Costume*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.blocks = '2022-March-15';
+modules.blocks = '2022-March-16';
 
 var SyntaxElementMorph;
 var BlockMorph;
@@ -3313,7 +3313,7 @@ BlockMorph.prototype.userMenu = function () {
             }
         );
     }
-    menu.addLine();
+    // +++ menu.addLine();
     menu.addItem(
         "script pic...",
         () => {
@@ -3339,11 +3339,14 @@ BlockMorph.prototype.userMenu = function () {
             'save a picture of both\nthis script and its result'
         );
     }
-    menu.addItem(
-        'export script',
-        () => top.exportScript(),
-        'download this script\nas an XML file'
-    );
+    if (this.world().currentKey === 16) { // +++ shift
+        menu.addItem(
+            'export script',
+            () => top.exportScript(),
+            'download this script\nas an XML file',
+            new Color(100, 0, 0)
+        );
+    }
     if (proc) {
         if (vNames.length) {
             menu.addLine();

diff --git a/src/gui.js b/src/gui.js
@@ -86,11 +86,12 @@ BlockVisibilityDialogMorph, ThreadManager*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.gui = '2022-March-15';
+modules.gui = '2022-March-16';
 
 // Declarations
 
-var SnapVersion = '7.4.0-dev';
+// +++ var SnapVersion = '7.4.0-dev';
+var SnapVersion = '7.3.1';
 
 var IDE_Morph;
 var ProjectDialogMorph;

diff --git a/src/objects.js b/src/objects.js
@@ -2792,14 +2792,14 @@ SpriteMorph.prototype.blockTemplates = function (
         blocks.push('-');
         blocks.push(block('doForEach'));
         blocks.push('-');
+        blocks.push(block('reportConcatenatedLists'));
+        blocks.push(block('reportReshape'));
+        // +++ blocks.push(block('reportCrossproduct'));
+        blocks.push('-');
         blocks.push(block('doAddToList'));
         blocks.push(block('doDeleteFromList'));
         blocks.push(block('doInsertInList'));
         blocks.push(block('doReplaceInList'));
-        blocks.push('-');
-        blocks.push(block('reportConcatenatedLists'));
-        blocks.push(block('reportReshape'));
-        blocks.push(block('reportCrossproduct'));
 
         if (SpriteMorph.prototype.showingExtensions) {
             blocks.push('=');
@@ -9197,14 +9197,14 @@ StageMorph.prototype.blockTemplates = function (
         blocks.push('-');
         blocks.push(block('doForEach'));
         blocks.push('-');
+        blocks.push(block('reportConcatenatedLists'));
+        blocks.push(block('reportReshape'));
+        // +++ blocks.push(block('reportCrossproduct'));
+        blocks.push('-');
         blocks.push(block('doAddToList'));
         blocks.push(block('doDeleteFromList'));
         blocks.push(block('doInsertInList'));
         blocks.push(block('doReplaceInList'));
-        blocks.push('-');
-        blocks.push(block('reportConcatenatedLists'));
-        blocks.push(block('reportReshape'));
-        blocks.push(block('reportCrossproduct'));
 
         if (SpriteMorph.prototype.showingExtensions) {
             blocks.push('=');

diff --git a/sw.js b/sw.js
@@ -1,4 +1,4 @@
-var snapVersion = '7.4.0-dev',
+var snapVersion = '7.3.1', // +++ '7.4.0-dev',
     cacheName = 'snap-pwa',
     filesToCache = [
         'snap.html',