v2.11.1

replace array#flatten() with array#flat()

update for SC 2.37 compatibility

update demo to latest SC version

Author: ChapelR

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "files.exclude": {
+        "**/node_modules": true,
+        "scripts/minified": true
+    }
+}

cmfsc2.code-workspace

@@ -0,0 +1,7 @@
+{
+	"folders": [
+		{
+			"path": ".",
+		}
+	]
+}

docs/README.md

@@ -1,4 +1,4 @@
-## Chapel's Custom Macro Collection (v2.11.0)
+## Chapel's Custom Macro Collection (v2.11.1)
 
 - [Try the demo!](https://macros.twinelab.net/demo) ([Sausage](https://github.com/ChapelR/custom-macros-demo))
 - [Downloads](https://macros.twinelab.net/download)

docs/changelog.md

@@ -2,6 +2,10 @@
 
 [Back to the main page](./README.md).
 
+### July 22, 2024 (v2.11.1)
+
+- **[Update]** SugarCube v2.37.0 dropped the `array#flatten()` polyfill, so all instances were replaced with `array#flat()`. I should have probably done this a while ago, but there's no time like the last possible second!
+
 ### February 20, 2024 (v2.11.0)
 
 - **[Retired]** Removed Simple Inventory 2 in favor of [Simple Inventory 3](https://inventory.twinelab.net/).

docs/demo/index.html

@@ -1,6 +1,6 @@
 {
   "name": "custom-macros-for-sugarcube-2",
-  "version": "2.9.0",
+  "version": "2.11.1",
   "description": "Collection of custom macros and systems for Twine/SugarCube2.",
   "main": "build.js",
   "directories": {

package.json

@@ -28,7 +28,7 @@
         if (State.length > 0) {
             return false;
         }
-        var args = [].slice.call(arguments).flatten();
+        var args = [].slice.call(arguments).flat(Infinity);
         ignored = ignored.concat(args);
         return true;
     }
@@ -56,7 +56,7 @@
     }
 
     function reset () {
-        var args = [].slice.call(arguments).flatten();
+        var args = [].slice.call(arguments).flat(Infinity);
         ignored = ignored.concat(args);
         $(document).off('.continue-macro');
         ignoreMe();

scripts/continue.js

@@ -39,7 +39,7 @@
 
     function cssChanger (/*element, args...*/) {
         try {
-            var args = [].slice.call(arguments).flatten(),
+            var args = [].slice.call(arguments).flat(Infinity),
                 $el = args.shift(),
                 map;
             if (typeof args[0] === 'string') {

scripts/css-macro.js

@@ -27,7 +27,7 @@
         if (pl.args.length < 1) {
             return null;
         }
-        var phases = pl.args.flatten();
+        var phases = pl.args.flat(Infinity);
         if (!phases.every(function (ph) {
             return typeof ph === 'string';
         })) {
@@ -141,7 +141,7 @@
         },
         check : function (name) {
             if (Cycle.has(name)) {
-                var phases = [].slice.call(arguments).flatten().slice(1);
+                var phases = [].slice.call(arguments).flat(Infinity).slice(1);
                 return Cycle.get(name).check(phases);
             }
         },
@@ -256,7 +256,7 @@
             return this.increment;
         },
         check : function () {
-            var phases = [].slice.call(arguments).flatten();
+            var phases = [].slice.call(arguments).flat(Infinity);
             return phases.includes(this.current());
         }
     });
@@ -317,7 +317,7 @@
             // render the payload tags' args as cycles
             var phases = this.payload.slice(1).map( function (pl) {
                 return _payloadMapper(pl);
-            }).flatten();
+            }).flat(Infinity);
 
             if (phases.includes(null)) {
                 // throw on junk phases

scripts/cycles.js

@@ -11,7 +11,7 @@ Macro.add('dialog', {
         var errors = [];
         var content = '', onOpen = null, onClose = null;
         var title = (this.args.length > 0) ? this.args[0] : '';
-        var classes = (this.args.length > 1) ? this.args.slice(1).flatten() : [];
+        var classes = (this.args.length > 1) ? this.args.slice(1).flat(Infinity) : [];
 
         this.payload.forEach( function (pl, idx) {
             if (idx === 0) {
@@ -66,7 +66,7 @@ Macro.add('popup', {
         // passage name and title
         var psg   = this.args[0];
         var title = (this.args.length > 1) ? this.args[1] : '';
-        var classes = (this.args.length > 2) ? this.args.slice(2).flatten() : [];
+        var classes = (this.args.length > 2) ? this.args.slice(2).flat(Infinity) : [];
 
         // add the macro- class
         classes.push('macro-' + this.name);