This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 74b3eaad10794d843cae31f78a8756d70cb4f7b7 Author: jcouteau <couteau@codelutin.com> Date: Thu Aug 22 09:10:11 2019 +0200 Speed up content cleaning --- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java index 97a7d79d..f06c0351 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/FaxToMailUIUtil.java @@ -993,16 +993,19 @@ public final class FaxToMailUIUtil extends ApplicationUIUtil { // <img src='cid:5e9ef859-ea65-4f9b-a9fa-30d4a2c5837c' content = content.replaceAll("(\\w+)=([\"'])cid:" + Pattern.quote(key) + "([\"'])", "$1=$2" + file.toURI() + "$3"); - //remove the height and width on images as that can force big width with no horizontal scroll on rendering #10344 - content = content.replaceAll("(\\w+) width=([\"'])(\\w+)([\"'])", "$1"); - content = content.replaceAll("(\\w+) height=([\"'])(\\w+)([\"'])", "$1"); - if (log.isDebugEnabled()) { log.debug("Mapping attachment id " + key + " to file " + file.toURI()); } } - - //remove as that can force big width with no horizontal scroll on rendering #10344 + //remove the height, width and style on elements as that can force big width with no horizontal scroll on rendering, cf. #10344 + content = content.replaceAll("(.+) width=([\"])(.+)([\"])", "$1"); + content = content.replaceAll("(.+) width=(['])(.+)(['])", "$1"); + content = content.replaceAll("(.+) height=([\"])(.+)([\"])", "$1"); + content = content.replaceAll("(.+) height=(['])(.+)(['])", "$1"); + content = content.replaceAll("(.+) style=([\"])(.+)([\"])", "$1"); + content = content.replaceAll("(.+) style=(['])(.+)(['])", "$1"); + + //remove as that can force big width with no horizontal scroll on rendering, cf. #10344 content = content.replaceAll(" ",""); if (log.isTraceEnabled()) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.