@@ -49,8 +49,8 @@ Bluetooth.on('data',function(d) {
4949});
5050Bluetooth.on('line',function(l) {
5151 if (l.startsWith('\x10')) l=l.slice(1);
52- if (l.startsWith('GB({') && l.endsWith('})') && global .GB)
53- try { global .GB(JSON.parse(l.slice(3,-1))); } catch(e) {}
52+ if (l.startsWith('GB({') && l.endsWith('})') && globalThis .GB)
53+ try { globalThis .GB(JSON.parse(l.slice(3,-1))); } catch(e) {}
5454});\n` ;
5555} else {
5656 if ( s . log >= 2 ) boot += `_DBGLOG=require("Storage").open("log.txt","a");
@@ -73,7 +73,7 @@ if (s.log) boot += `E.on('errorFlag', function(errorFlags) {
7373 E.getErrorFlags();
7474});\n` ; // E.getErrorFlags() -> clear flags so we get called next time
7575// stop users doing bad things!
76- if ( global . save ) boot += `global .save = function() { throw new Error("You can't use save() on Bangle.js without overwriting the bootloader!"); }\n` ;
76+ if ( globalThis . save ) boot += `globalThis .save = function() { throw new Error("You can't use save() on Bangle.js without overwriting the bootloader!"); }\n` ;
7777// Apply any settings-specific stuff
7878if ( s . options ) boot += `Bangle.setOptions(${ E . toJS ( s . options ) } );\n` ;
7979if ( s . brightness && s . brightness != 1 ) boot += `Bangle.setLCDBrightness(${ s . brightness } );\n` ;
@@ -85,7 +85,7 @@ if (s.bleprivacy || (s.passkey!==undefined && s.passkey.length==6)) {
8585if ( s . blename === false ) boot += `NRF.setAdvertising({},{showName:false});\n` ;
8686if ( s . whitelist && ! s . whitelist_disabled ) boot += `NRF.on('connect', function(addr) { if (!NRF.ignoreWhitelist) { let whitelist = (require('Storage').readJSON('setting.json',1)||{}).whitelist; if (NRF.resolveAddress !== undefined) { let resolvedAddr = NRF.resolveAddress(addr); if (resolvedAddr !== undefined) addr = resolvedAddr + " (resolved)"; } if (!whitelist.includes(addr)) NRF.disconnect(); }});\n` ;
8787if ( s . rotate ) boot += `g.setRotation(${ s . rotate & 3 } ,${ s . rotate >> 2 } );\n` // screen rotation
88- boot += `Bangle.loadWidgets=function(){if(!global .WIDGETS)eval(require("Storage").read(".widcache"))};\n` ;
88+ boot += `Bangle.loadWidgets=function(){if(!globalThis .WIDGETS)eval(require("Storage").read(".widcache"))};\n` ;
8989// ================================================== FIXING OLDER FIRMWARES
9090// deleting stops us getting confused by our own decl. builtins can't be deleted
9191// this is a polyfill without fastloading capability
@@ -175,7 +175,7 @@ require('Storage').write('.boot0',bootPost,fileOffset);
175175delete boot , bootPost , bootFiles ;
176176// ================================================== .WIDCACHE for widgets
177177let widgetFiles = require ( "Storage" ) . list ( / \. w i d \. j s $ / ) ;
178- let widget = `// Made by bootupdate.js\nglobal .WIDGETS={};` , widgetPost = `var W=WIDGETS;WIDGETS={};
178+ let widget = `// Made by bootupdate.js\nglobalThis .WIDGETS={};` , widgetPost = `var W=WIDGETS;WIDGETS={};
179179Object.keys(W).sort((a,b)=>(0|W[b].sortorder)-(0|W[a].sortorder)).forEach(k=>WIDGETS[k]=W[k]);` ; // sort
180180if ( DEBUG ) widget += "var _tm=Date.now();" ;
181181outputFileComplete = ( dst , fn ) => {
0 commit comments