From d88bf17c30a3503323b5c8f3e1be89a3f439e6ab Mon Sep 17 00:00:00 2001 From: saber-nyan Date: Tue, 26 Nov 2019 18:17:12 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Packet.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Packet.vue b/src/components/Packet.vue index e8d89d8..a8891fb 100644 --- a/src/components/Packet.vue +++ b/src/components/Packet.vue @@ -37,7 +37,7 @@ }, stringdata() { const dataString = atob(this.packet.content); - const dump = this.base64ToHtml(dataString); + const dump = this.highlightPatterns(dataString); return this.escapeHtml(dump) .split('\n') .join('
'); @@ -87,11 +87,11 @@ return $1 ? $1 : entityMap[$0]; }); }, - base64ToHtml(raw) { // FIXME: Пересекающиеся паттерны приводят к неожиданным результатам + highlightPatterns(raw) { // FIXME: Пересекающиеся паттерны приводят к неожиданным результатам const patterns = this.$store.state.patterns.reduce((obj, item) => { obj[item.id] = item; return obj; - }, {}); + }, {}); // Array to object let offset = 0; this.packet.matches .sort((a, b) => a.startPosition - b.startPosition)