From 115ddcfb91f9ed03c5fb9acca5e1e6693ac0c000 Mon Sep 17 00:00:00 2001 From: Mirco Wittrien Date: Fri, 14 Aug 2020 15:41:21 +0200 Subject: [PATCH] Update ImageUtilities.plugin.js --- .../ImageUtilities/ImageUtilities.plugin.js | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/Plugins/ImageUtilities/ImageUtilities.plugin.js b/Plugins/ImageUtilities/ImageUtilities.plugin.js index a60758af73..0cce8b77c3 100644 --- a/Plugins/ImageUtilities/ImageUtilities.plugin.js +++ b/Plugins/ImageUtilities/ImageUtilities.plugin.js @@ -513,9 +513,10 @@ var ImageUtilities = (_ => { ].flat(10).filter(n => n) }); } + let index = 0; if (messages.length) { let images = messages.map(n => Array.from(n.querySelectorAll(BDFDB.dotCNS.imagewrapper + "img"))).flat().filter(img => !BDFDB.DOMUtils.getParent(BDFDB.dotCN.spoilerhidden, img)); - let next, previous, index = 0, amount = images.length; + let next, previous, amount = images.length; for (let i = 0; i < amount; i++) if (this.isSameImage(src, images[i])) { index = i; previous = images[i-1]; @@ -530,24 +531,24 @@ var ImageUtilities = (_ => { if (e.instance.nextRef) e.returnvalue.props.children.splice(1, 0, this.createImageWrapper(e.instance, e.instance.nextRef, "next", BDFDB.LibraryComponents.SvgIcon.Names.RIGHT_CARET)); else this.loadImage(e.instance, next, "next"); } - if (settings.addDetails) e.returnvalue.props.children.push(BDFDB.ReactUtils.createElement("div", { - className: BDFDB.disCN._imageutilitiesdetailswrapper, - children: [ - {label: "Source", text: e.instance.props.src}, - {label: "Size", text: `${e.instance.props.width} x ${e.instance.props.height}px`}, - {label: "Image", text: `${index + 1} of ${amount}`} - ].map(data => BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TextElement, { - className: BDFDB.disCN._imageutilitiesdetails, - children: [ - BDFDB.ReactUtils.createElement("div", { - className: BDFDB.disCN._imageutilitiesdetailslabel, - children: data.label + ":" - }), - data.text - ] - })) - })); } + if (settings.addDetails) e.returnvalue.props.children.push(BDFDB.ReactUtils.createElement("div", { + className: BDFDB.disCN._imageutilitiesdetailswrapper, + children: [ + {label: "Source", text: e.instance.props.src}, + {label: "Size", text: `${e.instance.props.width} x ${e.instance.props.height}px`}, + {label: "Image", text: `${index + 1} of ${amount}`} + ].map(data => BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.TextElement, { + className: BDFDB.disCN._imageutilitiesdetails, + children: [ + BDFDB.ReactUtils.createElement("div", { + className: BDFDB.disCN._imageutilitiesdetailslabel, + children: data.label + ":" + }), + data.text + ] + })) + })); } if (e.node) { let modal = BDFDB.DOMUtils.getParent(BDFDB.dotCNC.modal + BDFDB.dotCN.layermodal, e.node); @@ -789,6 +790,7 @@ var ImageUtilities = (_ => { enabledEngines = BDFDB.ObjectUtils.filter(engines, n => n); BDFDB.ModuleUtils.forceAllUpdates(this); + BDFDB.MessageUtils.rerenderAll(); } setLabelsByLanguage () {