adb-shared 3.0.24 → 3.0.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -20,17 +20,11 @@ export class HighlightPipe2 {
|
|
|
20
20
|
const normalizedSearch = this.normalizeText(search);
|
|
21
21
|
const normalizedValue = this.normalizeText(value);
|
|
22
22
|
const start = normalizedValue ? normalizedValue.indexOf(normalizedSearch) : -1;
|
|
23
|
-
console.log('start', start);
|
|
24
23
|
if (start !== -1) {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
}
|
|
30
|
-
else {
|
|
31
|
-
return `<mark>${match}</mark>`; // add <mark> tag around match
|
|
32
|
-
}
|
|
33
|
-
});
|
|
24
|
+
if (start !== -1) {
|
|
25
|
+
const regex = new RegExp(`([^<\\w]|^)(${search})(?![^<]*>)`, 'gi');
|
|
26
|
+
value = value.replace(regex, '$1<mark>$2</mark>');
|
|
27
|
+
}
|
|
34
28
|
}
|
|
35
29
|
}
|
|
36
30
|
}
|
|
@@ -48,4 +42,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.8", ngImpor
|
|
|
48
42
|
name: 'adbHighlight2'
|
|
49
43
|
}]
|
|
50
44
|
}] });
|
|
51
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGlnaGxpZ2h0Mi5waXBlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvYXJ0ZGF0YS1zaGFyZWQvc3JjL2xpYi9waXBlcy9oaWdobGlnaHQyLnBpcGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLElBQUksRUFBaUIsTUFBTSxlQUFlLENBQUM7O0FBSXBELE1BQU0sT0FBTyxjQUFjO0lBSDNCO1FBSUkscUJBQWdCLEdBQUcseUNBQXlDLENBQUM7S0E2QmhFO0lBNUJHLFNBQVMsQ0FBQyxLQUFVLEVBQUUsT0FBWTtRQUM5QixJQUFJLENBQUMsS0FBSyxFQUFFO1lBQUUsT0FBTyxLQUFLLENBQUM7U0FBRTtRQUM3QixLQUFLLEdBQUcsS0FBSyxHQUFHLEVBQUUsQ0FBQztRQUNuQixJQUFJLE9BQU8sRUFBRTtZQUNULElBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFFO2dCQUN6QixPQUFPLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQzthQUMvQztZQUNELEtBQUssSUFBSSxNQUFNLElBQUksT0FBTyxFQUFFO2dCQUN4QixJQUFJLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLEVBQUU7b0JBQ3BDLE1BQU0sR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxFQUFFLENBQUMsQ0FBQztpQkFDdEQ7Z0JBQ0QsTUFBTSxnQkFBZ0IsR0FBRyxJQUFJLENBQUMsYUFBYSxDQUFDLE1BQU0sQ0FBQyxDQUFDO2dCQUNwRCxNQUFNLGVBQWUsR0FBRyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxDQUFDO2dCQUNsRCxNQUFNLEtBQUssR0FBRyxlQUFlLENBQUMsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQy9FLElBQUksS0FBSyxLQUFLLENBQUMsQ0FBQyxFQUFFO29CQUNkLElBQUksS0FBSyxLQUFLLENBQUMsQ0FBQyxFQUFFO3dCQUNkLE1BQU0sS0FBSyxHQUFFLElBQUksTUFBTSxDQUFDLGVBQWUsTUFBTSxhQUFhLEVBQUUsSUFBSSxDQUFDLENBQUM7d0JBQ2xFLEtBQUssR0FBRyxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUssRUFBRSxtQkFBbUIsQ0FBQyxDQUFDO3FCQUNyRDtpQkFDSjthQUNKO1NBQ0o7UUFDRCxPQUFPLEtBQUssQ0FBQztJQUNqQixDQUFDO0lBRU8sYUFBYSxDQUFDLElBQVk7UUFDOUIsT0FBTyxJQUFJLEVBQUUsU0FBUyxDQUFDLEtBQUssQ0FBQyxDQUFDLE9BQU8sQ0FBQyxrQkFBa0IsRUFBRSxFQUFFLENBQUMsQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO0lBQ3RGLENBQUM7OzhIQTdCUSxjQUFjOzRIQUFkLGNBQWM7MkZBQWQsY0FBYztrQkFIMUIsSUFBSTttQkFBQztvQkFDRixJQUFJLEVBQUUsZUFBZTtpQkFDeEIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBQaXBlLCBQaXBlVHJhbnNmb3JtIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XHJcbkBQaXBlKHtcclxuICAgIG5hbWU6ICdhZGJIaWdobGlnaHQyJ1xyXG59KVxyXG5leHBvcnQgY2xhc3MgSGlnaGxpZ2h0UGlwZTIgaW1wbGVtZW50cyBQaXBlVHJhbnNmb3JtIHtcclxuICAgIGZvcmJpZGRlblN5bWJvbHMgPSAvW2AhQCMkJV4mKigpXytcXC09XFxbXFxde307JzpcIlxcXFx8LC48PlxcLz9+XS87XHJcbiAgICB0cmFuc2Zvcm0odmFsdWU6IGFueSwgc2VhcmNoczogYW55KTogYW55IHtcclxuICAgICAgICBpZiAoIXZhbHVlKSB7IHJldHVybiB2YWx1ZTsgfVxyXG4gICAgICAgIHZhbHVlID0gdmFsdWUgKyAnJztcclxuICAgICAgICBpZiAoc2VhcmNocykge1xyXG4gICAgICAgICAgICBpZiAoIUFycmF5LmlzQXJyYXkoc2VhcmNocykpIHtcclxuICAgICAgICAgICAgICAgIHNlYXJjaHMgPSBzZWFyY2hzLnNwbGl0KCcgJykuZmlsdGVyKHMgPT4gcyk7XHJcbiAgICAgICAgICAgIH1cclxuICAgICAgICAgICAgZm9yIChsZXQgc2VhcmNoIG9mIHNlYXJjaHMpIHtcclxuICAgICAgICAgICAgICAgIGlmICh0aGlzLmZvcmJpZGRlblN5bWJvbHMudGVzdChzZWFyY2gpKSB7XHJcbiAgICAgICAgICAgICAgICAgICAgc2VhcmNoID0gc2VhcmNoLnJlcGxhY2UodGhpcy5mb3JiaWRkZW5TeW1ib2xzLCAnJyk7XHJcbiAgICAgICAgICAgICAgICB9XHJcbiAgICAgICAgICAgICAgICBjb25zdCBub3JtYWxpemVkU2VhcmNoID0gdGhpcy5ub3JtYWxpemVUZXh0KHNlYXJjaCk7XHJcbiAgICAgICAgICAgICAgICBjb25zdCBub3JtYWxpemVkVmFsdWUgPSB0aGlzLm5vcm1hbGl6ZVRleHQodmFsdWUpO1xyXG4gICAgICAgICAgICAgICAgY29uc3Qgc3RhcnQgPSBub3JtYWxpemVkVmFsdWUgPyBub3JtYWxpemVkVmFsdWUuaW5kZXhPZihub3JtYWxpemVkU2VhcmNoKSA6IC0xO1xyXG4gICAgICAgICAgICAgICAgaWYgKHN0YXJ0ICE9PSAtMSkge1xyXG4gICAgICAgICAgICAgICAgICAgIGlmIChzdGFydCAhPT0gLTEpIHtcclxuICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgcmVnZXggPW5ldyBSZWdFeHAoYChbXjxcXFxcd118XikoJHtzZWFyY2h9KSg/IVtePF0qPilgLCAnZ2knKTtcclxuICAgICAgICAgICAgICAgICAgICAgICAgdmFsdWUgPSB2YWx1ZS5yZXBsYWNlKHJlZ2V4LCAnJDE8bWFyaz4kMjwvbWFyaz4nKTtcclxuICAgICAgICAgICAgICAgICAgICB9XHJcbiAgICAgICAgICAgICAgICB9XHJcbiAgICAgICAgICAgIH1cclxuICAgICAgICB9XHJcbiAgICAgICAgcmV0dXJuIHZhbHVlO1xyXG4gICAgfVxyXG5cclxuICAgIHByaXZhdGUgbm9ybWFsaXplVGV4dCh0ZXh0OiBzdHJpbmcpOiBzdHJpbmcge1xyXG4gICAgICAgIHJldHVybiB0ZXh0Py5ub3JtYWxpemUoJ05GRCcpLnJlcGxhY2UoL1tcXHUwMzAwLVxcdTAzNmZdL2csICcnKS50b0xvY2FsZUxvd2VyQ2FzZSgpO1xyXG4gICAgfVxyXG59XHJcbiJdfQ==
|
package/fesm2015/adb-shared.mjs
CHANGED
|
@@ -779,17 +779,11 @@ class HighlightPipe2 {
|
|
|
779
779
|
const normalizedSearch = this.normalizeText(search);
|
|
780
780
|
const normalizedValue = this.normalizeText(value);
|
|
781
781
|
const start = normalizedValue ? normalizedValue.indexOf(normalizedSearch) : -1;
|
|
782
|
-
console.log('start', start);
|
|
783
782
|
if (start !== -1) {
|
|
784
|
-
|
|
785
|
-
|
|
786
|
-
|
|
787
|
-
|
|
788
|
-
}
|
|
789
|
-
else {
|
|
790
|
-
return `<mark>${match}</mark>`; // add <mark> tag around match
|
|
791
|
-
}
|
|
792
|
-
});
|
|
783
|
+
if (start !== -1) {
|
|
784
|
+
const regex = new RegExp(`([^<\\w]|^)(${search})(?![^<]*>)`, 'gi');
|
|
785
|
+
value = value.replace(regex, '$1<mark>$2</mark>');
|
|
786
|
+
}
|
|
793
787
|
}
|
|
794
788
|
}
|
|
795
789
|
}
|