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

[Libreoffice Gerrit user]

 loleaflet/reference.html              |   14 ++++++++++++++
 loleaflet/src/layer/tile/TileLayer.js |    2 +-
 loleaflet/src/map/Map.js              |    6 ++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit a3cb69c1cfee21e9b9e7121aa3add32aa50ab7d9
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Jan 3 14:53:58 2019 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Jan 4 12:45:52 2019 +0100

    WOPI: added FollowUser_Changed notification
    
    Change-Id: Ibd98bcd373b6df06b02f6cf265e99e74e6ba9ce2

diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index aed14d3ee..58bdb351b 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -3017,6 +3017,20 @@ Actions response
 		is mentioned by <code>Action_Save</code> PostMessage API.
 		</td>
 	</tr>
+	<tr>
+		<td><code><b>FollowUser_Changed</b></code></td>
+		<td><code>
+			<nobr>FollowedViewId: <Number></nobr>
+			<nobr>IsFollowUser: <Boolean></nobr>
+			<nobr>IsFollowEditor: <Boolean></nobr>
+		</code></td>
+		<td>Notification about current following state.<br/>
+		<code>FollowedViewId</code> tells which user is followed. <code>IsFollowUser</code> determines if following the specific user is
+		activated. <code>IsFollowEditor</code> determines if following the editor is
+		activated. If both <code>IsFollowUser</code> & <code>IsFollowEditor</code> are false then following is
+		inactive.
+		</td>
+	</tr>
 </table>
 
 <h3 id="loleaflet-postmessage-versioning">Version Restore</h3>
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 122c74aee..94b8d5ece 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -1402,6 +1402,12 @@ L.Map = L.Evented.extend({
 			this.fire('deselectuser', {viewId: this._docLayer._followThis});
 			this._docLayer._followThis = -1;
 		}
+
+		// Notify about changes
+		this.fire('postMessage', {msgId: 'FollowUser_Changed',
+			args: {FollowedViewId: this._docLayer._followThis,
+				IsFollowUser: followUser,
+				IsFollowEditor: followEditor}});
 	},
 
 	toggleMenubar: function() {
commit 64fb42fe19bfe18351a89e678a9215c306c09b38
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Jan 3 16:26:21 2019 +0100
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Jan 4 12:45:26 2019 +0100

    Fix following users feature
    
    Bug related to fff8cce5
    
    Change-Id: Ie9778ea8e381fc8c19d11eb72c2d11d7787fb017

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 165181d31..0134298d5 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1706,7 +1706,7 @@ L.TileLayer = L.GridLayer.extend({
 				center.x = Math.round(center.x < 0 ? 0 : center.x);
 				center.y = Math.round(center.y < 0 ? 0 : center.y);
 
-				this._map.fire('scrollto', {x: center.x, y: center.y});
+				this._map.fire('scrollto', {x: center.x, y: center.y, calledFromInvalidateCursorMsg: true});
 			}
 
 			this._viewCursors[viewId].marker.showCursorHeader();