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

[Szymon KÅ‚os (via logerrit)]

 loleaflet/src/control/Control.Toolbar.js |    2 ++
 loleaflet/src/map/handler/Map.Mouse.js   |    3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c054059fc0cdeca8dbe4ee28d628d3f944dc45d4
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Dec 12 12:27:01 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Dec 12 13:04:30 2019 +0100

    jsdialog: double Sidebar call in Inplace mode
    
    To activate Sidebar in Chart activated context.
    
    Change-Id: I4579f01e45d0b56bdee32f649498820c404cd5a9

diff --git a/loleaflet/src/control/Control.Toolbar.js b/loleaflet/src/control/Control.Toolbar.js
index a068c3af9..7c5586c3f 100644
--- a/loleaflet/src/control/Control.Toolbar.js
+++ b/loleaflet/src/control/Control.Toolbar.js
@@ -349,6 +349,8 @@ function onClick(e, id, item, subItem) {
 			if (!map._sidebarVisible) {
 				map._sidebarVisible = true;
 				map.sendUnoCommand('.uno:Sidebar');
+				if (map.hasObjectFocusDarkOverlay())
+					map.sendUnoCommand('.uno:Sidebar');
 			} else {
 				// As the sidebar LOKWindowId can and does change,
 				// esp. between chart and other elements, we apparently
commit ccc1c54b18703368eefa78beed8f13da39b2e034
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Dec 12 11:32:12 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Thu Dec 12 13:04:25 2019 +0100

    Prevent fake doubleclick detection on Background color applying
    
    When selecting the highlight for a text only some attempts
    were successful because of detection the mouseup event two times
    in a short period of time (0-1 ms).
    
    Change-Id: Iafba078edbc4442921dc00b58829c5dbf4c2ed74

diff --git a/loleaflet/src/map/handler/Map.Mouse.js b/loleaflet/src/map/handler/Map.Mouse.js
index e18fc6ad5..21b884366 100644
--- a/loleaflet/src/map/handler/Map.Mouse.js
+++ b/loleaflet/src/map/handler/Map.Mouse.js
@@ -117,7 +117,8 @@ L.Map.Mouse = L.Handler.extend({
 			}
 			clearTimeout(this._holdMouseEvent);
 			this._holdMouseEvent = null;
-			if (this._clickTime && Date.now() - this._clickTime <= 250) {
+			var timeDiff = Date.now() - this._clickTime;
+			if (this._clickTime && timeDiff > 1 && timeDiff <= 250) {
 				// double click, a click was sent already
 				this._mouseEventsQueue = [];
 				this._clickCount++;