fixed evaluating special strings inside numerical input slots

jmoenig · Jan 25, 2025 · 5e565d1 · 5e565d1
1 parent 058b468
commit 5e565d1
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 9 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -2,6 +2,14 @@
 
 ## in development:
 
+## 10.4.5:
+* **Notable Fixes:**
+    * fixed evaluating special strings inside numerical input slots
+
+### 2025-01-25
+* blocks: fixed evaluating special strings inside numerical input slots
+* prepared v10.4.5 patch 
+
 ## 10.4.4:
 * **Notable Fixes:**
     * fixed alphanumeric input slot evaluation for list accessors

diff --git a/snap.html b/snap.html
@@ -16,11 +16,11 @@
         <script src="src/morphic.js?version=2025-01-21"></script>
         <script src="src/symbols.js?version=2024-11-24"></script>
         <script src="src/widgets.js?version=2024-07-24"></script>
-        <script src="src/blocks.js?version=2025-01-24-2"></script>
+        <script src="src/blocks.js?version=2025-01-25"></script>
         <script src="src/threads.js?version=2025-01-24"></script>
         <script src="src/objects.js?version=2025-01-24"></script>
         <script src="src/scenes.js?version=2024-05-28"></script>
-        <script src="src/gui.js?version=2025-01-24-2"></script>
+        <script src="src/gui.js?version=2025-01-25"></script>
         <script src="src/paint.js?version=2023-05-24"></script>
         <script src="src/lists.js?version=2025-01-07"></script>
         <script src="src/byob.js?version=2024-12-18"></script>

diff --git a/src/blocks.js b/src/blocks.js
@@ -162,7 +162,7 @@ CustomHatBlockMorph*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.blocks = '2025-January-24';
+modules.blocks = '2025-January-25';
 
 var SyntaxElementMorph;
 var BlockMorph;
@@ -12334,8 +12334,11 @@ InputSlotMorph.prototype.mappedCode = function () {
 
 InputSlotMorph.prototype.evaluate = function () {
     // answer my contents, which can be a "wish", i.e. a block that refers to
-    // another sprite's local method, or a text string.
-    var val;
+    // another sprite's local method, or a text string. If I am numerical
+    // convert that string to a number. If the conversion fails answer the
+    // string (e.g. for special choices like 'random', 'all' or 'last')
+    // otherwise the numerical value.
+    var val, num;
  	if (this.selectedBlock) {
   		return this.selectedBlock;
   	}
@@ -12353,7 +12356,10 @@ InputSlotMorph.prototype.evaluate = function () {
         !this.isAlphanumeric &&
         (!this.evaluateAsString || val === '')
     ) {
-        return +val;
+        num = +val;
+        if (!isNaN(num)) {
+            return num;
+        }
     }
     return val;
 };

diff --git a/src/gui.js b/src/gui.js
@@ -87,11 +87,11 @@ HatBlockMorph*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.gui = '2025-January-24';
+modules.gui = '2025-January-25';
 
 // Declarations
 
-var SnapVersion = '10.4.4';
+var SnapVersion = '10.4.5';
 
 var IDE_Morph;
 var ProjectDialogMorph;

diff --git a/sw.js b/sw.js
@@ -1,6 +1,6 @@
 /*global self, caches*/
 /*jshint esversion: 6*/
-var snapVersion = '10.4.4',
+var snapVersion = '10.4.5',
     cacheName = `snap-pwa-${snapVersion}`,
     filesToCache = [
         'snap.html',