Skip to content

Commit a10a29a

Browse files
ts-thomasts-thomas
committed
highlighted results are misleading #514 
1 parent eadecbb commit a10a29a

23 files changed

Lines changed: 330 additions & 301 deletions

‎dist/flexsearch.bundle.debug.js‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**!
2-
* FlexSearch.js v0.8.207 (Bundle/Debug)
2+
* FlexSearch.js v0.8.208 (Bundle/Debug)
33
* Author and Copyright: Thomas Wilkerling
44
* Licence: Apache-2.0
55
* Hosted by Nextapps GmbH
@@ -1144,12 +1144,12 @@ function bb(a, c, b, e, d, f, g) {
11441144
z = z.length > 1 ? z.join(" ") : z[0];
11451145
let y;
11461146
if (z && B) {
1147-
var C = B.length, K = (ea.split ? B.replace(ea.split, "") : B).length - z.length, F = "", L = 0;
1147+
var C = B.length, J = (ea.split ? B.replace(ea.split, "") : B).length - z.length, F = "", L = 0;
11481148
for (var O = 0; O < n.length; O++) {
11491149
var P = n[O];
11501150
if (P) {
11511151
var M = P.length;
1152-
M += K;
1152+
M += J < 0 ? 0 : J;
11531153
L && M <= L || (P = z.indexOf(P), P > -1 && (F = (P ? B.substring(0, P) : "") + g + B.substring(P, P + M) + h + (P + M < C ? B.substring(P + M) : ""), L = M, y = !0));
11541154
}
11551155
}
@@ -1172,32 +1172,32 @@ function bb(a, c, b, e, d, f, g) {
11721172
E = {};
11731173
B = {};
11741174
z = {};
1175-
F = K = C = 0;
1175+
F = J = C = 0;
11761176
for (O = L = 1;;) {
11771177
var U = void 0;
1178-
for (let y = 0, J; y < za.length; y++) {
1179-
J = za[y];
1178+
for (let y = 0, K; y < za.length; y++) {
1179+
K = za[y];
11801180
if (F) {
1181-
if (K !== F) {
1181+
if (J !== F) {
11821182
if (E[y + 1]) {
11831183
continue;
11841184
}
1185-
J += F;
1186-
if (A[J]) {
1185+
K += F;
1186+
if (A[K]) {
11871187
C -= u;
11881188
G[y + 1] = 1;
11891189
E[y + 1] = 1;
11901190
continue;
11911191
}
1192-
if (J >= v.length - 1) {
1193-
if (J >= v.length) {
1192+
if (K >= v.length - 1) {
1193+
if (K >= v.length) {
11941194
E[y + 1] = 1;
1195-
J >= x.length && (G[y + 1] = 1);
1195+
K >= x.length && (G[y + 1] = 1);
11961196
continue;
11971197
}
11981198
C -= u;
11991199
}
1200-
q = v[J].text;
1200+
q = v[K].text;
12011201
if (M = t && z[y]) {
12021202
if (M > 0) {
12031203
if (q.length > M) {
@@ -1226,22 +1226,22 @@ function bb(a, c, b, e, d, f, g) {
12261226
if (E[y]) {
12271227
continue;
12281228
}
1229-
J -= K;
1230-
if (A[J]) {
1229+
K -= J;
1230+
if (A[K]) {
12311231
C -= u;
12321232
E[y] = 1;
12331233
G[y] = 1;
12341234
continue;
12351235
}
1236-
if (J <= 0) {
1237-
if (J < 0) {
1236+
if (K <= 0) {
1237+
if (K < 0) {
12381238
E[y] = 1;
12391239
G[y] = 1;
12401240
continue;
12411241
}
12421242
C -= u;
12431243
}
1244-
q = v[J].text;
1244+
q = v[K].text;
12451245
if (M = r && B[y]) {
12461246
if (M > 0) {
12471247
if (q.length > M) {
@@ -1268,13 +1268,13 @@ function bb(a, c, b, e, d, f, g) {
12681268
}
12691269
}
12701270
} else {
1271-
q = v[J].match;
1271+
q = v[K].match;
12721272
r && (B[y] = r);
12731273
t && (z[y] = t);
12741274
y && C++;
12751275
let Qa;
1276-
J ? !y && u && (C += u) : (G[y] = 1, E[y] = 1);
1277-
J >= x.length - 1 ? Qa = 1 : J < v.length - 1 && v[J + 1].match ? Qa = 1 : u && (C += u);
1276+
K ? !y && u && (C += u) : (G[y] = 1, E[y] = 1);
1277+
K >= x.length - 1 ? Qa = 1 : K < v.length - 1 && v[K + 1].match ? Qa = 1 : u && (C += u);
12781278
C -= f.length - 2;
12791279
if (!y || C + q.length <= k) {
12801280
D[y] = q;
@@ -1285,21 +1285,21 @@ function bb(a, c, b, e, d, f, g) {
12851285
Qa && (G[y + 1] = 1, E[y + 1] = 1);
12861286
}
12871287
C += q.length;
1288-
U = A[J] = 1;
1288+
U = A[K] = 1;
12891289
}
12901290
if (U) {
1291-
K === F ? F++ : K++;
1291+
J === F ? F++ : J++;
12921292
} else {
1293-
K === F ? L = 0 : O = 0;
1293+
J === F ? L = 0 : O = 0;
12941294
if (!L && !O) {
12951295
break;
12961296
}
1297-
L ? (K++, F = K) : F++;
1297+
L ? (J++, F = J) : F++;
12981298
}
12991299
}
13001300
q = "";
1301-
for (let y = 0, J; y < D.length; y++) {
1302-
J = (G[y] ? y ? " " : "" : (y && !d ? " " : "") + d) + D[y], q += J;
1301+
for (let y = 0, K; y < D.length; y++) {
1302+
K = (G[y] ? y ? " " : "" : (y && !d ? " " : "") + d) + D[y], q += K;
13031303
}
13041304
d && !G[D.length] && (q += d);
13051305
}
@@ -1633,13 +1633,13 @@ Na.prototype.search = function(a, c, b, e) {
16331633
}
16341634
} else {
16351635
A = Object.keys(z);
1636-
for (let C = 0, K, F; C < A.length; C++) {
1637-
if (K = A[C], F = z[K], F.constructor === Array) {
1636+
for (let C = 0, J, F; C < A.length; C++) {
1637+
if (J = A[C], F = z[J], F.constructor === Array) {
16381638
for (D = 0; D < F.length; D++) {
1639-
v.push(K, F[D]);
1639+
v.push(J, F[D]);
16401640
}
16411641
} else {
1642-
v.push(K, F);
1642+
v.push(J, F);
16431643
}
16441644
}
16451645
}
@@ -1690,7 +1690,7 @@ Na.prototype.search = function(a, c, b, e) {
16901690
p || (p = this.field);
16911691
let G;
16921692
v = (this.worker || this.db) && !e && [];
1693-
for (let B = 0, z, C, K; B < p.length; B++) {
1693+
for (let B = 0, z, C, J; B < p.length; B++) {
16941694
C = p[B];
16951695
if (this.db && this.tag && !this.B[B]) {
16961696
continue;
@@ -1711,8 +1711,8 @@ Na.prototype.search = function(a, c, b, e) {
17111711
continue;
17121712
}
17131713
}
1714-
K = (z = z.result || z) && z.length;
1715-
if (n && K) {
1714+
J = (z = z.result || z) && z.length;
1715+
if (n && J) {
17161716
A = [];
17171717
D = 0;
17181718
if (this.db && e) {
@@ -1745,14 +1745,14 @@ Na.prototype.search = function(a, c, b, e) {
17451745
}
17461746
if (D) {
17471747
z = db(z, A, r);
1748-
K = z.length;
1749-
if (!K && !k) {
1748+
J = z.length;
1749+
if (!J && !k) {
17501750
return r ? z : new X(z, this);
17511751
}
17521752
D--;
17531753
}
17541754
}
1755-
if (K) {
1755+
if (J) {
17561756
f[u] = C, d.push(z), u++;
17571757
} else if (p.length === 1) {
17581758
return r ? d : new X(d, this);

0 commit comments

Comments
 (0)