[Libreoffice-commits] online.git: 2 commits - loleaflet/src wsd/README.vars

[Pranav Kant]

 loleaflet/src/layer/marker/Annotation.js |   13 ++++++++-----
 wsd/README.vars                          |    5 +++++
 2 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 827d3f63cb5b68b186bf76755eda05ea18f9491a
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Wed May 17 23:30:20 2017 +0530

    loleaflet: Use safer text assignment method
    
    Change-Id: Idb0e5454f5d795132c762e22c596710bfed75770

diff --git a/loleaflet/src/layer/marker/Annotation.js b/loleaflet/src/layer/marker/Annotation.js
index 93c71983..5c577289 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -2,6 +2,8 @@
  * L.Annotation
  */
 
+/* global $ Autolinker L */
+
 L.Annotation = L.Layer.extend({
 	options: {
 		minWidth: 160,
@@ -284,16 +286,17 @@ L.Annotation = L.Layer.extend({
 
 	_updateContent: function () {
 		var linkedText = Autolinker.link(this._data.text);
-		this._contentText.innerHTML = linkedText;
+		$(this._contentText).text(linkedText);
 		// Original unlinked text
-		this._contentText.origText = this._nodeModifyText.innerHTML = this._data.text;
-		this._contentAuthor.innerHTML = this._data.author;
+		this._contentText.origText = this._data.text;
+		$(this._nodeModifyText).text(this._data.text);
+		$(this._contentAuthor).text(this._data.author);
 
 		var d = new Date(this._data.dateTime.replace(/,.*/, 'Z'));
-		this._contentDate.innerHTML = (isNaN(d.getTime()) || this._map.getDocType() === 'spreadsheet')? this._data.dateTime: d.toDateString();
+		$(this._contentDate).text((isNaN(d.getTime()) || this._map.getDocType() === 'spreadsheet')? this._data.dateTime: d.toDateString());
 
 		if (this._data.trackchange) {
-			this._captionText.innerHTML = this._data.description;
+			$(this._captionText).text(this._data.description);
 		}
 	},
 
commit 46acd74d83bd6ae85b497d49c260f250d1604a1a
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Wed May 17 23:15:17 2017 +0530

    Document LOOL_SERVE_FROM_FS
    
    Change-Id: I10d71979366f61839f2aedaf6886fa5f03132004

diff --git a/wsd/README.vars b/wsd/README.vars
index 862465fd..e1f81773 100644
--- a/wsd/README.vars
+++ b/wsd/README.vars
@@ -35,3 +35,8 @@ LOOL_WS_JITTER		<jitter in milliseconds for websocket communication>
 LOOL_STORAGE_COOKIE <key:value>
 	Sets a cookie to all the requests made to storage. This is extremely useful for
 	debugging WOPI implementations. For eg: Using XDebug with OwnCloud/NextCloud.
+
+LOOL_SERVE_FROM_FS
+	If mentioned, files are not loaded into the memory on start, instead they are
+	read from the filesystem. This can be helpful in loleaflet development
+	where you can tweak it without restarting wsd.