deadcxap/liberama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Поправка бага, комментариев

Browse Source
This commit is contained in:
Book Pauk
2019-02-20 18:04:05 +07:00
parent 618111ab05
commit 56d13288ff
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/components/Reader/TextPage/DrawHelper.js
View File

@@ -45,11 +45,12 @@ export default class DrawHelper {
last: Boolean, last: Boolean,
parts: array of { parts: array of {
style: {bold: Boolean, italic: Boolean, center: Boolean}, style: {bold: Boolean, italic: Boolean, center: Boolean},
image: {local: Boolean, inline: Boolean, id: String, imageLine: Number, lineCount: Number, resize: Boolean, paraIndex: Number}, image: {local: Boolean, inline: Boolean, id: String, imageLine: Number, lineCount: Number, paraIndex: Number},
text: String, text: String,
} }
}*/ }*/
let sel = new Set(); let sel = new Set();
//поиск
if (i == 0 && this.searching) { if (i == 0 && this.searching) {
let pureText = ''; let pureText = '';
for (const part of line.parts) { for (const part of line.parts) {
@@ -73,6 +74,7 @@ export default class DrawHelper {
let lineText = ''; let lineText = '';
let center = false; let center = false;
let j = 0; let j = 0;
//формируем строку
for (const part of line.parts) { for (const part of line.parts) {
let tOpen = (part.style.bold ? '<b>' : ''); let tOpen = (part.style.bold ? '<b>' : '');
tOpen += (part.style.italic ? '<i>' : ''); tOpen += (part.style.italic ? '<i>' : '');
@@ -88,12 +90,15 @@ export default class DrawHelper {
} else } else
text = part.text; text = part.text;
if (text.trim() == '')
text = `<span style="white-space: pre">${text}</span>`;
lineText += `${tOpen}${text}${tClose}`; lineText += `${tOpen}${text}${tClose}`;
center = center || part.style.center; center = center || part.style.center;
//избражения //избражения
//image: {local: Boolean, inline: Boolean, id: String, imageLine: Number, lineCount: Number, resize: Boolean, paraIndex: Number}, //image: {local: Boolean, inline: Boolean, id: String, imageLine: Number, lineCount: Number, paraIndex: Number},
const img = part.image; const img = part.image;
if (img && img.id && !img.inline && !imageDrawn.has(img.paraIndex)) { if (img && img.id && !img.inline && !imageDrawn.has(img.paraIndex)) {
if (img.local) { if (img.local) {
@@ -122,6 +127,7 @@ export default class DrawHelper {
const centerStyle = (center ? `text-align: center; text-align-last: center; width: ${this.w}px` : '') const centerStyle = (center ? `text-align: center; text-align-last: center; width: ${this.w}px` : '')
if (line.first && !center) if (line.first && !center)
lineText = `<span style="display: inline-block; margin-left: ${this.p}px"></span>${lineText}`; lineText = `<span style="display: inline-block; margin-left: ${this.p}px"></span>${lineText}`;
if (line.last || center) if (line.last || center)
lineText = `<span style="display: inline-block; ${centerStyle}">${lineText}</span>`; lineText = `<span style="display: inline-block; ${centerStyle}">${lineText}</span>`;