[Libreoffice-commits] online.git: loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/src/layer/tile/TileLayer.js |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 85b2bd3ab24d883cc1f94d7de53e4204c310178d
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri May 17 13:42:00 2019 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Fri May 17 14:11:32 2019 +0200

    Prefer HTML over RTF for pasting on the Mac.
    
    Safari provides RTF clipboard content which doesn't contain the images.
    We do not know where the content comes from, so let's always prefer HTML
    over RTF on Mac.
    
    Change-Id: I2f449ff4cf025e5f51dbe6e0683667f2d319ac21
    Reviewed-on: https://gerrit.libreoffice.org/72461
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    (cherry picked from commit 2998ab914e057d5c9bae3e3b03c0cf5f13e531b9)
    Reviewed-on: https://gerrit.libreoffice.org/72465
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 43256a15e..75a28a3d0 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -2381,6 +2381,16 @@ L.TileLayer = L.GridLayer.extend({
 				['text/plain', 'text/plain;charset=utf-8'],
 				['Text', 'text/plain;charset=utf-8']
 			];
+		} else if (navigator.platform.startsWith('Mac')) {
+			// Safari provides RTF clipboard content which doesn't contain the
+			// images.  We do not know where the content comes from, so let's
+			// always prefer HTML over RTF on Mac.
+			mimeTypes = [
+				['text/html', 'text/html'],
+				['text/rtf', 'text/rtf'],
+				['text/plain', 'text/plain;charset=utf-8'],
+				['Text', 'text/plain;charset=utf-8']
+			];
 		} else {
 			mimeTypes = [
 				['text/rtf', 'text/rtf'],