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

[Szymon KÅ‚os (via logerrit)]

 loleaflet/src/control/Control.LokDialog.js |    2 +-
 loleaflet/src/core/Socket.js               |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 9b67948143f55e22e80216b5324cf3919a098e68
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Tue Jul 28 13:40:16 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Jul 29 10:15:34 2020 +0200

    Avoid usage of null variable
    
    Change-Id: I2e428baaef22094c40d316ea31a11bdf626af2d0
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99612
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 05490d2bf..77c813232 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -314,7 +314,9 @@ L.Socket = L.Class.extend({
 		}
 		else if (textMsg.startsWith('osinfo ')) {
 			var osInfo = textMsg.replace('osinfo ', '');
-			document.getElementById('os-info').innerText = osInfo;
+			var osInfoElement = document.getElementById('os-info');
+			if (osInfoElement)
+				osInfoElement.innerText = osInfo;
 		}
 		else if (textMsg.startsWith('clipboardkey: ')) {
 			var key = textMsg.substring('clipboardkey: '.length);
commit 616125143aea1ed4ddad404e631292e85c93222c
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Mon Jun 22 22:25:10 2020 +0530
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Jul 29 10:15:22 2020 +0200

    leaflet: row/column headers offset corrected
    
    Change-Id: Icc4ca2649de4f618fc1a44a0896ed12a98d2b70f
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99545
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index 1b70b1cc0..b2a0aa5b6 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1500,7 +1500,7 @@ L.Control.LokDialog = L.Control.extend({
 				if (that._currentDeck) {
 					var sidebar = L.DomUtil.get(that._currentDeck.strId);
 					if (sidebar) {
-						deckOffset = sidebar.clientWidth + 10; // Allow some margin.
+						deckOffset = sidebar.clientWidth;
 					}
 				}
 				var correctWidth = container.clientWidth - deckOffset;