juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-02 07:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Share one fuzzy matcher across both dialogs

Browse Source 
Plugins dialog and the Speed Dial popup each
carried a private copy of the same fuzzy
matcher and had already drifted. Move the
pure functions into a shared module loaded
by both pages, and add a unit test beside
it.
This commit is contained in:
Andrew
2026-07-10 17:32:31 +08:00
parent df5c293d2e
commit 7b19145226
6 changed files with 106 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources/web/dialog/SpeedDial/index.html
View File

@@ -7,6 +7,7 @@
<link rel="stylesheet" href="./style.css" />
<link rel="stylesheet" type="text/css" href="../css/theme.css" />
<script type="text/javascript" src="../../include/globalapi.js"></script>
<script src="../../js/fuzzy-search.js"></script>
<script src="./speeddial.js"></script>
</head>
<body onload="OnInit()">

33
resources/web/dialog/SpeedDial/speeddial.js
View File

@@ -9,38 +9,13 @@ var sel = { zone: "list", i: 0 }; // zone: 'list' | 'fav'
var lastResizeHeight = 0;
var matchIndex = {};
function FoldChar(ch) {
return ch.normalize("NFD").replace(/\p{Diacritic}/gu, "");
}
function NormChar(ch) {
return FoldChar(ch).toLowerCase();
}
// why: fuzzy matcher (FoldChar/Norm/FuzzyRanges) lives in shared ../../js/fuzzy-search.js, loaded before
// this script - it is shared with the Plugins dialog. Speed dial search is always case-insensitive.
// element handles, assigned in OnInit (kept null so load-time touches no DOM)
var qEl = null, listEl = null, favEl = null, clearEl = null, eyeEl = null, countEl = null;
// ---- pure helpers (no DOM; unit-tested) -------------------------------------
function fuzzyRanges(text, query) {
var t = text || "";
var q = query || "";
if (!q)
return null;
var needle = Array.from(q).map(function (c) { return NormChar(c); }).join("");
var ranges = [];
var qi = 0;
for (var i = 0; i < t.length && qi < needle.length; i++) {
if (NormChar(t[i]) === needle[qi]) {
if (ranges.length && ranges[ranges.length - 1][1] === i)
ranges[ranges.length - 1][1] = i + 1;
else
ranges.push([i, i + 1]);
qi++;
}
}
return qi === needle.length ? ranges : null;
}
function filterActions(actions, query) {
var q = (query || "").trim();
var list = actions || [];
@@ -51,8 +26,8 @@ function filterActions(actions, query) {
var out = [];
for (var i = 0; i < list.length; i++) {
var a = list[i];
var titleMatch = fuzzyRanges(a.title, q);
var pkgMatch = fuzzyRanges(a.pkg, q);
var titleMatch = FuzzyRanges(a.title, q, false);
var pkgMatch = FuzzyRanges(a.pkg, q, false);
if (!titleMatch && !pkgMatch)
continue;
matchIndex[a.id] = { title: titleMatch, pkg: pkgMatch, useTitle: !!titleMatch };