Revert "Use modulo for doSelectPreviousNextSource"

This reverts commit 987952f.
googlefonts · Oct 23, 2024 · 5fb2e61 · 5fb2e61
1 parent 987952f
commit 5fb2e61
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/src/fontra/views/editor/editor.js b/src/fontra/views/editor/editor.js
@@ -42,7 +42,6 @@ import {
   isObjectEmpty,
   loadURLFragment,
   makeUPlusStringFromCodePoint,
-  modulo,
   parseSelection,
   range,
   readFromClipboard,
@@ -2793,18 +2792,18 @@ export class EditorController {
     }
     const varGlyphController =
       await this.sceneModel.getSelectedVariableGlyphController();
-
-    const sourceIndex =
-      this.sceneSettings.selectedSourceIndex ||
-      varGlyphController.findNearestSourceFromSourceLocation({
+    const sourceIndex = this.sceneSettings.selectedSourceIndex;
+    let newSourceIndex;
+    if (sourceIndex === undefined) {
+      newSourceIndex = varGlyphController.findNearestSourceFromSourceLocation({
         ...this.sceneSettings.fontLocationSourceMapped,
         ...this.sceneSettings.glyphLocation,
       });
-    const newSourceIndex = modulo(
-      sourceIndex + (selectPrevious ? -1 : 1),
-      varGlyphController.sources.length
-    );
-
+    } else {
+      const numSources = varGlyphController.sources.length;
+      newSourceIndex =
+        (selectPrevious ? sourceIndex + numSources - 1 : sourceIndex + 1) % numSources;
+    }
     this.sceneController.scrollAdjustBehavior = "pin-glyph-center";
     this.sceneSettings.selectedSourceIndex = newSourceIndex;
   }