bug: keyb up/down scrolling

Author: kirjavascript

CHANGELOG

@@ -2,6 +2,8 @@
 
 ## [1.0.0]
 - Changed default palette from Sonic 2 to the SCH unified palette
+- Fixed a bug that allows deleting mappings in drawing mode
+- Fixed a bug where up/down scrolls when there are active mappings
 
 ## [0.0.7]
 - Added changelog

app/components/mappings/state/index.js

@@ -155,7 +155,7 @@ class MappingState {
     };
 
     @computed get center() {
-        if (!this.activeMappings.length) return void 0;
+        if (!this.activeMappings.length) return;
 
         return getCenter(this.activeMappings);
     }

app/controls/commands.js

@@ -189,7 +189,7 @@ export const commands = [
         {
             map: 'up', name: 'Move Up', hasShift: true, color: 'white',
             func: (e) => {
-                e && e.preventDefault();
+                mappingState.hasActive && e.preventDefault();
                 mappingState.mutateActive((mapping) => {
                     mapping.top -= getDistance();
                 });
@@ -198,7 +198,7 @@ export const commands = [
         {
             map: 'down', name: 'Move Down', hasShift: true, color: 'white',
             func: (e) => {
-                e && e.preventDefault();
+                mappingState.hasActive && e.preventDefault();
                 mappingState.mutateActive((mapping) => {
                     mapping.top += getDistance();
                 });
@@ -209,21 +209,15 @@ export const commands = [
     [
         {
             map: 'e', name: 'Export PNG', color: 'blue', noMultiplier: true,
-            func: () => {
-                exportPNG();
-            },
+            func: exportPNG,
         },
         {
             map: 'i', name: 'Import Over Sprite', color: 'blue', noMultiplier: true,
-            func: () => {
-                importImg();
-            },
+            func: importImg,
         },
         {
             map: 's', name: 'Import Spritesheet', color: 'blue', noMultiplier: true,
-            func: () => {
-                importState.newImport();
-            },
+            func: importState.newImport,
         },
     ],
 

app/controls/keyboard.js

@@ -7,10 +7,10 @@ import flatten from 'lodash/flatten';
 flatten(commands)
     .forEach((obj) => {
         if (obj.hasShift) {
-            Mousetrap.bind([obj.map, `shift+${obj.map}`], () => doCommand(obj));
+            Mousetrap.bind([obj.map, `shift+${obj.map}`], doCommand.bind(null, obj));
         }
         else {
-            Mousetrap.bind(obj.map, () => doCommand(obj));
+            Mousetrap.bind(obj.map, doCommand.bind(null, obj));
         }
     });
 
@@ -22,14 +22,14 @@ Mousetrap.bind(['0','1','2','3','4','5','6','7','8','9'], (e) => {
 Mousetrap.bind('esc', () => {
     multiplier = '';
 });
-function doCommand(obj) {
+function doCommand(obj, e) {
     environment.doAction(() => {
         if (!obj.noMultiplier && multiplier) {
             for (let i = 0; i < +multiplier; i++) obj.func();
             multiplier = '';
         }
         else {
-            obj.func();
+            obj.func(e);
         }
     });
 }

app/formats/scripts/index.js

@@ -1,8 +1,11 @@
+// next: file menu + custom loader
+//
 // script language
 
 // padding / fill
 // optimizations(false);
 // loadASM();
+// customOffset()
 // mappingHeader -> index 0
 // reverse endianness
 // end tokens