From 9af9a59927c5985ce79c554ee0a940171ee31ccc Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 20 Apr 2022 13:36:40 +0200 Subject: [PATCH] wait #5245 @0.5 --- js/libs/fluidbook/fluidbook.bookmarks.js | 5 ++++- js/libs/fluidbook/fluidbook.tabs.js | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/js/libs/fluidbook/fluidbook.bookmarks.js b/js/libs/fluidbook/fluidbook.bookmarks.js index bb799991..ec4f9581 100644 --- a/js/libs/fluidbook/fluidbook.bookmarks.js +++ b/js/libs/fluidbook/fluidbook.bookmarks.js @@ -43,10 +43,13 @@ FluidbookBookmarks.prototype = { if ($this.fluidbook.settings.bookmark_email_body !== '') { body = $this.fluidbook.settings.bookmark_email_body; } + if(body.indexOf('%link%')===-1){ + body += $this.fluidbook.l10n.__(": ") +'%link%'; + } subject = subject.replace(/\%title\%/gi, $this.fluidbook.settings.title); body = trim(body.replace(/\%title\%/gi, $this.fluidbook.settings.title), ' .:'); - body += $this.fluidbook.l10n.__(": ") + $this.getPDF(); + body = body.replace(/\%link\%/gi, $this.getPDF()); $this.fluidbook.share.intentShare(subject, body); return false; diff --git a/js/libs/fluidbook/fluidbook.tabs.js b/js/libs/fluidbook/fluidbook.tabs.js index 2935c938..0b1d0492 100644 --- a/js/libs/fluidbook/fluidbook.tabs.js +++ b/js/libs/fluidbook/fluidbook.tabs.js @@ -424,6 +424,7 @@ FluidbookTabs.prototype = { } catch (e) { } + // Bug #5238 on safari mac if (this.fluidbook.support.safari && this.fluidbook.support.macOs) { setTimeout(function () { -- 2.39.5