[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/dist loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/dist/toolbar/w2ui-1.5.rc1.js        |    2 +-
 loleaflet/src/core/LOUtil.js                  |    2 +-
 loleaflet/src/layer/marker/ProgressOverlay.js |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fc511aaf049c3e5fe5316018ba945cfaafd956d0
Author:     Ashod Nakashian <ashod.nakashian at collabora.co.uk>
AuthorDate: Thu Nov 8 11:05:22 2018 -0500
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Thu Nov 8 20:15:07 2018 +0100

    leaflet: reduce some animation timeouts to avoid hammering cpu/browser
    
    Change-Id: I4194db181f1cc0f89c906cbb87846c89df47e4ee
    Reviewed-on: https://gerrit.libreoffice.org/63108
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/loleaflet/dist/toolbar/w2ui-1.5.rc1.js b/loleaflet/dist/toolbar/w2ui-1.5.rc1.js
index 89f54de62..b9f7d778d 100644
--- a/loleaflet/dist/toolbar/w2ui-1.5.rc1.js
+++ b/loleaflet/dist/toolbar/w2ui-1.5.rc1.js
@@ -2093,7 +2093,7 @@ w2utils.event = {
                     hideTag();
                     return;
                 }
-                if (!instant) setTimeout(checkIfMoved, 100);
+                if (!instant) setTimeout(checkIfMoved, 200);
                 // monitor if moved
                 var posClass = 'w2ui-tag-right';
                 var posLeft  = parseInt(offset.left + el.offsetWidth + (options.left ? options.left : 0));
diff --git a/loleaflet/src/core/LOUtil.js b/loleaflet/src/core/LOUtil.js
index fad8ad527..42c513736 100644
--- a/loleaflet/src/core/LOUtil.js
+++ b/loleaflet/src/core/LOUtil.js
@@ -38,7 +38,7 @@ L.LOUtil = {
 			context.beginPath();
 			context.arc(x, y, radius, 0, Math.PI * 1.3);
 			context.stroke();
-		}, 1);
+		}, 30);
 
 		return spinnerInterval;
 	},
diff --git a/loleaflet/src/layer/marker/ProgressOverlay.js b/loleaflet/src/layer/marker/ProgressOverlay.js
index a6f7e3532..4a60e89c5 100644
--- a/loleaflet/src/layer/marker/ProgressOverlay.js
+++ b/loleaflet/src/layer/marker/ProgressOverlay.js
@@ -5,7 +5,7 @@
 L.ProgressOverlay = L.Layer.extend({
 
 	options: {
-		spinnerSpeed: 1.5
+		spinnerSpeed: 15
 	},
 
 	initialize: function (latlng, size) {