[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/dist loleaflet/src

[Pranav Kant]

 loleaflet/dist/loleaflet.css             |   19 +++++++++++++++++++
 loleaflet/src/layer/marker/Annotation.js |    2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 1e19b704934976715f5a8d5344ea19195de979d4
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Mon Apr 24 20:21:34 2017 +0530

    loleaflet: Wrap both comments and redlines
    
    Change-Id: Iee0c61340cc78b93a2d3d23157bab715c3e7411e
    (cherry picked from commit 2b38191e3be6f9ebeff5d407b89b76fb70b3efec)
    Reviewed-on: https://gerrit.libreoffice.org/36922
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/dist/loleaflet.css b/loleaflet/dist/loleaflet.css
index 274548e4..9f643e4e 100644
--- a/loleaflet/dist/loleaflet.css
+++ b/loleaflet/dist/loleaflet.css
@@ -157,6 +157,25 @@ body {
 	line-height: 1.4;
 }
 
+/* Taken from https://css-tricks.com/snippets/css/prevent-long-urls-from-breaking-out-of-container/ */
+.loleaflet-dont-break {
+        /* These are technically the same, but use both */
+        overflow-wrap: break-word;
+	word-wrap: break-word;
+
+	-ms-word-break: break-all;
+	/* This is the dangerous one in WebKit, as it breaks things wherever */
+	word-break: break-all;
+	/* Instead use this non-standard one: */
+	word-break: break-word;
+
+	/* Adds a hyphen where the word breaks, if supported (No Blink) */
+	-ms-hyphens: auto;
+	-moz-hyphens: auto;
+	-webkit-hyphens: auto;
+	hyphens: auto;
+}
+
 .loleaflet-annotation-content-author {
 	margin: 0;
 	margin-top: 2px;
diff --git a/loleaflet/src/layer/marker/Annotation.js b/loleaflet/src/layer/marker/Annotation.js
index 6f580cab..30959f20 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -182,7 +182,7 @@ L.Annotation = L.Layer.extend({
 			this._captionNode = L.DomUtil.create(tagDiv, 'loleaflet-annotation-caption', wrapper);
 			this._captionText = L.DomUtil.create(tagDiv, empty, this._captionNode);
 		}
-		this._contentNode = L.DomUtil.create(tagDiv, 'loleaflet-annotation-content', wrapper);
+		this._contentNode = L.DomUtil.create(tagDiv, 'loleaflet-annotation-content loleaflet-dont-break', wrapper);
 		this._nodeModify = L.DomUtil.create(tagDiv, classEdit, wrapper);
 		this._nodeModifyText = L.DomUtil.create(tagTextArea, classTextArea, this._nodeModify);
 		this._contentText = L.DomUtil.create(tagDiv, empty, this._contentNode);