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

Pranam Lashkari (via logerrit) logerrit at kemper.freedesktop.org
Tue Sep 15 13:49:46 UTC 2020


 loleaflet/src/control/Control.FormulaBar.js      |    3 ++-
 loleaflet/src/control/Control.PresentationBar.js |    3 ++-
 loleaflet/src/control/Control.SearchBar.js       |    3 ++-
 loleaflet/src/control/Control.SheetsBar.js       |    3 ++-
 loleaflet/src/control/Control.SigningBar.js      |    3 ++-
 loleaflet/src/control/Control.StatusBar.js       |    3 ++-
 loleaflet/src/control/Control.TopToolbar.js      |    3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 40a67b00a20132d85a25d3bbf5b525e21edf9b80
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Sat Sep 12 11:23:28 2020 +0530
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Sep 15 15:49:26 2020 +0200

    leaflet: disable tooltip in mobile and tablet
    
    Change-Id: I591b2392d6c7072144bd7229a60933c61a2f3241
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/102506
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/src/control/Control.FormulaBar.js b/loleaflet/src/control/Control.FormulaBar.js
index b58353d82..a4d666009 100644
--- a/loleaflet/src/control/Control.FormulaBar.js
+++ b/loleaflet/src/control/Control.FormulaBar.js
@@ -42,7 +42,8 @@ L.Control.FormulaBar = L.Control.extend({
 				$('#addressInput').off('keyup', that.onAddressInput.bind(that)).on('keyup', that.onAddressInput.bind(that));
 			}
 		});
-		toolbar.tooltip();
+		if (window.mode.isDesktop())
+			toolbar.tooltip();
 
 		toolbar.bind('touchstart', function(e) {
 			w2ui['formulabar'].touchStarted = true;
diff --git a/loleaflet/src/control/Control.PresentationBar.js b/loleaflet/src/control/Control.PresentationBar.js
index 2adcf2eae..26076245b 100644
--- a/loleaflet/src/control/Control.PresentationBar.js
+++ b/loleaflet/src/control/Control.PresentationBar.js
@@ -42,7 +42,8 @@ L.Control.PresentationBar = L.Control.extend({
 				window.hideTooltip(this, e.target);
 			}
 		});
-		toolbar.tooltip();
+		if (window.mode.isDesktop())
+			toolbar.tooltip();
 
 		toolbar.bind('touchstart', function() {
 			w2ui['presentation-toolbar'].touchStarted = true;
diff --git a/loleaflet/src/control/Control.SearchBar.js b/loleaflet/src/control/Control.SearchBar.js
index 1025d39cf..a4d82f445 100644
--- a/loleaflet/src/control/Control.SearchBar.js
+++ b/loleaflet/src/control/Control.SearchBar.js
@@ -38,7 +38,8 @@ L.Control.SearchBar = L.Control.extend({
 				window.setupSearchInput();
 			}
 		});
-		toolbar.tooltip();
+		if (window.mode.isDesktop())
+			toolbar.tooltip();
 
 		toolbar.bind('touchstart', function(e) {
 			w2ui['searchbar'].touchStarted = true;
diff --git a/loleaflet/src/control/Control.SheetsBar.js b/loleaflet/src/control/Control.SheetsBar.js
index d3a6012e9..a67e425e7 100644
--- a/loleaflet/src/control/Control.SheetsBar.js
+++ b/loleaflet/src/control/Control.SheetsBar.js
@@ -35,7 +35,8 @@ L.Control.SheetsBar = L.Control.extend({
 				window.hideTooltip(this, e.target);
 			}
 		});
-		toolbar.tooltip();
+		if (window.mode.isDesktop())
+			toolbar.tooltip();
 
 		toolbar.bind('touchstart', function(e) {
 			w2ui['spreadsheet-toolbar'].touchStarted = true;
diff --git a/loleaflet/src/control/Control.SigningBar.js b/loleaflet/src/control/Control.SigningBar.js
index c31d90ee4..acffbd77f 100644
--- a/loleaflet/src/control/Control.SigningBar.js
+++ b/loleaflet/src/control/Control.SigningBar.js
@@ -27,7 +27,8 @@ L.Control.SigningBar = L.Control.extend({
 				onRefresh: function() {
 				}
 			});
-			toolbar.tooltip();
+			if (window.mode.isDesktop())
+				toolbar.tooltip();
 
 			toolbar.bind('touchstart', function() {
 				w2ui['document-signing-bar'].touchStarted = true;
diff --git a/loleaflet/src/control/Control.StatusBar.js b/loleaflet/src/control/Control.StatusBar.js
index 67752f432..29a844e9f 100644
--- a/loleaflet/src/control/Control.StatusBar.js
+++ b/loleaflet/src/control/Control.StatusBar.js
@@ -238,7 +238,8 @@ L.Control.StatusBar = L.Control.extend({
 					window.setupSearchInput();
 				}
 			});
-			toolbar.tooltip();
+			if (window.mode.isDesktop())
+				toolbar.tooltip();
 			toolbar.show();
 		}
 
diff --git a/loleaflet/src/control/Control.TopToolbar.js b/loleaflet/src/control/Control.TopToolbar.js
index a77cf23a1..29cf538d4 100644
--- a/loleaflet/src/control/Control.TopToolbar.js
+++ b/loleaflet/src/control/Control.TopToolbar.js
@@ -258,7 +258,8 @@ L.Control.TopToolbar = L.Control.extend({
 					window.insertShapes();
 			}
 		});
-		toolbar.tooltip();
+		if (window.mode.isDesktop())
+			toolbar.tooltip();
 
 		toolbar.bind('touchstart', function() {
 			w2ui['editbar'].touchStarted = true;


More information about the Libreoffice-commits mailing list