[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - 2 commits - loleaflet/dist loleaflet/src

[Pranav Kant]

 loleaflet/dist/toolbar/toolbar.js |    5 +++++
 loleaflet/src/control/Toolbar.js  |    6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit add7191273438a5a60bc03896df2c6438fcbf755
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu Jan 12 19:10:12 2017 +0530

    loleaflet: Avoid a race condition
    
    There was a race condition here between our toolbar doing its
    stuff and loolwsd sending us websocket messages, noticeable on
    slow networks.
    
    Change-Id: I5ae174e94561dd427d22389e443c80b2a6be4ec4
    Reviewed-on: https://gerrit.libreoffice.org/35566
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 04fd7955..7d76b8d7 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1173,6 +1173,10 @@ map.on('updatetoolbarcommandvalues', function (e) {
 	}
 });
 
+map.on('updatetoolbarcommandvalues', function(e) {
+       w2ui['toolbar-up'].refresh();
+});
+
 map.on('updateparts pagenumberchanged', function (e) {
 	if (e.docType === 'text') {
 		var current = e.currentPage;
diff --git a/loleaflet/src/control/Toolbar.js b/loleaflet/src/control/Toolbar.js
index 3de887fe..2e87ff65 100644
--- a/loleaflet/src/control/Toolbar.js
+++ b/loleaflet/src/control/Toolbar.js
@@ -44,7 +44,11 @@ L.Map.include({
 	},
 
 	getToolbarCommandValues: function (command) {
-		return this._docLayer._toolbarCommandValues[command];
+		if (this._docLayer) {
+			return this._docLayer._toolbarCommandValues[command];
+		}
+
+		return undefined;
 	},
 
 	downloadAs: function (name, format, options, id) {
commit 5e8009b73605013f306b03d9953536c6e5b9e25d
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Tue Dec 20 16:03:24 2016 +0530

    loleaflet: reset selection after search-not-found
    
    Change-Id: If1c10cb10d1fce79a4697d5cc548dae781cfb2ec
    Reviewed-on: https://gerrit.libreoffice.org/35568
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>

diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index 22630b3d..04fd7955 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1085,6 +1085,7 @@ map.on('search', function (e) {
 		toolbar.disable('searchnext');
 		toolbar.hide('cancelsearch');
 		L.DomUtil.addClass(searchInput, 'search-not-found');
+		map.resetSelection();
 		setTimeout(function () {
 			L.DomUtil.removeClass(searchInput, 'search-not-found');
 		}, 500);