From a75590c493bf28eb504735a4ace8f1a12ee75f66 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Sat, 23 Feb 2019 20:15:40 +0700 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D1=84=D0=BE=D1=80=D0=BC=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20fb2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/core/BookConverter/index.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/server/core/BookConverter/index.js b/server/core/BookConverter/index.js index c10ef413..4b383ad1 100644 --- a/server/core/BookConverter/index.js +++ b/server/core/BookConverter/index.js @@ -479,21 +479,29 @@ class BookConverter { } } + let tOpen = ''; + let tBody = ''; + let tClose = ''; if (name) - out += `<${name}${attrs}>`; + tOpen += `<${name}${attrs}>`; if (node.hasOwnProperty('_t')) - out += repSpaces(node._t); + tBody += repSpaces(node._t); for (let nodeName in node) { if (nodeName && nodeName[0] == '_' && nodeName != '_a') continue; const n = node[nodeName]; - out += this.formatFb2Node(n, nodeName); + tBody += this.formatFb2Node(n, nodeName); } if (name) - out += ``; + tClose += ``; + + if (attrs == '' && name == 'p' && tBody.trim() == '') + out += '' + else + out += `${tOpen}${tBody}${tClose}`; } return out; }