Bangle.js1: Fix issue where going out of and back into a menu would c…

…ause 'Back' to be added twice (fix #2470)
espruino · May 21, 2024 · 43f806d · 43f806d
1 parent 1f78e3d
commit 43f806d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -51,6 +51,7 @@
             jsvSkipName speed improvements by avoiding repeated masking of flags
             No longer call jsvKill/Init when resetting, but just jsvReset (this avoids free+malloc on ESP32)
             Bangle.js2: Bangle.setLCDOverlay can now take an object with {id:str, remove:fn} to deal with multiple users of overlays better
+            Bangle.js1: Fix issue where going out of and back into a menu would cause 'Back' to be added twice (fix #2470)
 
      2v21 : nRF52: free up 800b more flash by removing vector table padding
             Throw Exception when a Promise tries to resolve with another Promise (#2450)

diff --git a/libs/js/banglejs/E_showMenu_F18.js b/libs/js/banglejs/E_showMenu_F18.js
@@ -9,8 +9,8 @@
   var menuItems = Object.keys(items);
   if (options) {
     menuItems.splice(menuItems.indexOf(""),1);
-    if (options.back) { // handle 'options.back'
-      items["< Back"] = options.back;
+    if (options.back && !items["< Back"]) { // handle 'options.back'
+      items = Object.assign({"< Back":options.back},items);
       menuItems.unshift("< Back");
     }
   }

diff --git a/libs/js/banglejs/E_showMenu_F18.min.js b/libs/js/banglejs/E_showMenu_F18.min.js