[Libreoffice-commits] online.git: Branch 'libreoffice-5-4' - 4 commits - configure.ac loleaflet/dist loleaflet/src loolwsd-systemplate-setup

[Andras Timar]

 configure.ac                            |    2 +-
 loleaflet/dist/menubar.css              |    2 +-
 loleaflet/src/control/Control.Scroll.js |    8 ++++++--
 loolwsd-systemplate-setup               |    2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit fac62cbeef0565a9e7e743cabdd9a9d5b2d6bdde
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Sep 27 14:08:14 2017 +0200

    Bump version to 5.4.2.2
    
    Change-Id: Ib68dc57c9df50bed8ef808f8a430a5876819a9c6

diff --git a/configure.ac b/configure.ac
index ec36ae8a..8aab94d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([libreoffice-online], [5.4.1.2], [libreoffice at lists.freedesktop.org])
+AC_INIT([libreoffice-online], [5.4.2.2], [libreoffice at lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
commit 5472a94aaf037344b51d150d036cb97715cb61e9
Author: Henry Castro <hcastro at collabora.com>
Date:   Thu Sep 21 11:21:13 2017 -0400

    loleaflet: resolves: no row header in revision history
    
    _onUpdateScrollOffset is triggered when the client window is resized or
    when it is loading a new document. However, there are some cases when
    the offset is 0, it means to update row and columns.
    
    Change-Id: If4c4bb4f50335c642004ceb7723c8b5eb949cada
    Reviewed-on: https://gerrit.libreoffice.org/42752
    Reviewed-by: Marco Cecchetti <mrcekets at gmail.com>
    Tested-by: Marco Cecchetti <mrcekets at gmail.com>
    (cherry picked from commit 7e674e29c2614a3f3af941938f8062bd66fa5ff2)
    Signed-off-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/control/Control.Scroll.js b/loleaflet/src/control/Control.Scroll.js
index 3bbb5c5c..d11a9bc6 100644
--- a/loleaflet/src/control/Control.Scroll.js
+++ b/loleaflet/src/control/Control.Scroll.js
@@ -221,9 +221,13 @@ L.Control.Scroll = L.Control.extend({
 		// used on window resize
 		if (this._map._docLayer._docType === 'spreadsheet') {
 			var offset = new L.Point(e.x - this._prevScrollX, e.y - this._prevScrollY);
-			if (!offset.equals(new L.Point(0, 0))) {
-				this._onUpdateRowColumnHeaders({x: e.x, y: e.y, offset: offset});
+			if (offset.x === 0) {
+				offset.x = 1;
 			}
+			if (offset.y === 0) {
+				offset.y = 1;
+			}
+			this._onUpdateRowColumnHeaders({x: e.x, y: e.y, offset: offset});
 		}
 		this._ignoreScroll = null;
 		$('.scroll-container').mCustomScrollbar('stop');
commit 6d6beb19cd113f9546603950a1edea57412f3891
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Sep 22 17:04:29 2017 +0200

    no error if systemplate dir is existing
    
    Change-Id: I10aba648688ba92150efa41449190a3ba425f03c
    Reviewed-on: https://gerrit.libreoffice.org/42662
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>
    (cherry picked from commit ac0cf36843fe522b08a5e32033b787bbae545cf1)
    Signed-off-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
index 729220c3..790bbb38 100755
--- a/loolwsd-systemplate-setup
+++ b/loolwsd-systemplate-setup
@@ -9,7 +9,7 @@ INSTDIR=$2
 
 test -d "$INSTDIR" || { echo "No such directory: $INSTDIR"; exit 1; }
 
-mkdir $CHROOT || exit 1
+mkdir -p $CHROOT || exit 1
 
 CHROOT=`cd $CHROOT && /bin/pwd`
 INSTDIR=`cd $INSTDIR && /bin/pwd`
commit dac787994ecc407c86620148780ece79893e8a05
Author: Henry Castro <hcastro at collabora.com>
Date:   Tue Sep 19 21:46:09 2017 -0400

    loleaflet: fix background color of the top level menu items
    
    Change-Id: I548c700a16664e8acfc6010c1be549e6176f2383
    (cherry picked from commit 7f75603d15efc74d92e50996674338c6d98c2a34)
    Signed-off-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/dist/menubar.css b/loleaflet/dist/menubar.css
index d3a35fce..1d8e5eec 100644
--- a/loleaflet/dist/menubar.css
+++ b/loleaflet/dist/menubar.css
@@ -69,7 +69,7 @@
     background: #538ecd;
     color: #fff;
 }
-.lo-menu > li {
+.lo-menu > li, .lo-menu > li > a.disabled {
     background: #efefef; /* top-level menus remain greyish */
 }
 .lo-menu > li > a:hover, .lo-menu > li > a:focus, .lo-menu > li > a:active, .lo-menu > li > a.highlighted {