diff --git a/client/components/Reader/ContentsPage/ContentsPage.vue b/client/components/Reader/ContentsPage/ContentsPage.vue index e1f2d9a1..112d12b0 100644 --- a/client/components/Reader/ContentsPage/ContentsPage.vue +++ b/client/components/Reader/ContentsPage/ContentsPage.vue @@ -195,7 +195,6 @@ class ContentsPage extends Vue { const ims = parsed.images; for (i = 0; i < ims.length; i++) { const image = ims[i]; - let {id} = parsed.imageHrefToId(image.href); const label = `Изображение ${image.num}`; const indentStyle = getIndentStyle(1); @@ -203,7 +202,7 @@ class ContentsPage extends Vue { const p = parsed.para[image.paraIndex]; newImages.push({perc: (p.offset/parsed.textLength*100).toFixed(0), label, key: i, offset: p.offset, - indentStyle, labelStyle, type: (parsed.binary[id] ? parsed.binary[id].type : '')}); + indentStyle, labelStyle, type: (parsed.binary[image.id] ? parsed.binary[image.id].type : '')}); } this.images = newImages; diff --git a/client/components/Reader/share/BookParser.js b/client/components/Reader/share/BookParser.js index cec2f762..2355ccc8 100644 --- a/client/components/Reader/share/BookParser.js +++ b/client/components/Reader/share/BookParser.js @@ -204,6 +204,7 @@ export default class BookParser { let attrs = sax.getAttrsSync(tail); if (attrs.href && attrs.href.value) { const href = attrs.href.value; + const {id} = this.imageHrefToId(href); if (href[0] == '#') {//local if (inPara && !this.showInlineImagesInCenter && !center) growParagraph(``, 0); @@ -211,7 +212,7 @@ export default class BookParser { newParagraph(`${' '.repeat(maxImageLineCount)}`, maxImageLineCount); imageIndex++; - this.images.push({paraIndex, num: imageIndex, href}); + this.images.push({paraIndex, num: imageIndex, id}); if (inPara && this.showInlineImagesInCenter) newParagraph(' ', 1); @@ -220,7 +221,7 @@ export default class BookParser { newParagraph(`${' '.repeat(maxImageLineCount)}`, maxImageLineCount); imageIndex++; - this.images.push({paraIndex, num: imageIndex, href}); + this.images.push({paraIndex, num: imageIndex, id}); } } }