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

[Szymon KÅ‚os (via logerrit)]

 loleaflet/src/control/Control.FormulaBar.js |    2 +-
 loleaflet/src/control/Control.StatusBar.js  |   10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 9f55b8f46eba1410f0be0f93f01278d0d345fc60
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon May 11 12:31:48 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon May 11 13:15:26 2020 +0200

    Fix language menu in statusbar
    
    Sub items from the language submenu are executed by
    uno calls - added handler.
    
    Change-Id: Ia83cd9331de6468c7d5a7b6f5cdbe45e68595a8b
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93956
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/src/control/Control.StatusBar.js b/loleaflet/src/control/Control.StatusBar.js
index 9bd0c8d53..59f567ad7 100644
--- a/loleaflet/src/control/Control.StatusBar.js
+++ b/loleaflet/src/control/Control.StatusBar.js
@@ -109,7 +109,15 @@ L.Control.StatusBar = L.Control.extend({
 
 		var docLayer = this.map._docLayer;
 
-		if (id === 'zoomin' && this.map.getZoom() < this.map.getMaxZoom()) {
+		if (item.uno) {
+			if (item.unosheet && this.map.getDocType() === 'spreadsheet') {
+				this.map.toggleCommandState(item.unosheet);
+			}
+			else {
+				this.map.toggleCommandState(window.getUNOCommand(item.uno));
+			}
+		}
+		else if (id === 'zoomin' && this.map.getZoom() < this.map.getMaxZoom()) {
 			this.map.zoomIn(1);
 		}
 		else if (id === 'zoomout' && this.map.getZoom() > this.map.getMinZoom()) {
commit cdf964ba861a03634fd05587bb6ee5cd9588fd94
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Mon May 11 12:39:34 2020 +0200
Commit:     Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Mon May 11 13:15:20 2020 +0200

    Fix cell address input handler
    
    Change-Id: Ie0a7630597f442d7f7117870cd4a52ff5b476252
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/93957
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/loleaflet/src/control/Control.FormulaBar.js b/loleaflet/src/control/Control.FormulaBar.js
index e62bd2c86..60fd848d9 100644
--- a/loleaflet/src/control/Control.FormulaBar.js
+++ b/loleaflet/src/control/Control.FormulaBar.js
@@ -40,7 +40,7 @@ L.Control.FormulaBar = L.Control.extend({
 				window.hideTooltip(this, e.target);
 			},
 			onRefresh: function() {
-				$('#addressInput').off('keyup', this.onAddressInput, this).on('keyup', this.onAddressInput, this);
+				$('#addressInput').off('keyup', that.onAddressInput.bind(that)).on('keyup', that.onAddressInput.bind(that));
 			}
 		});
 		toolbar.bind('touchstart', function(e) {