loleaflet/src/layer/tile/GridLayer.js | 4 ++--
loleaflet/src/layer/tile/TileLayer.js | 6 ------
2 files changed, 2 insertions(+), 8 deletions(-)
New commits:
commit 025a95c6689bb9939c10c5ca6b543165a4f4f9aa
Author: Mihai Varga <mihai.va...@collabora.com>
Date: Wed Jul 8 14:45:18 2015 +0300
loleaflet: disable fade Animation as it still causes problems
diff --git a/loleaflet/src/layer/tile/GridLayer.js
b/loleaflet/src/layer/tile/GridLayer.js
index 79875ef..b658b28 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -36,6 +36,7 @@ L.GridLayer = L.Layer.extend({
this._tiles = {};
this._tileCache = {};
+ this._map._fadeAnimated = false;
this._viewReset();
this._update();
this._map._docLayer = this;
@@ -453,7 +454,6 @@ L.GridLayer = L.Layer.extend({
},
_move: function () {
- this._skipFadeAnimated = false;
this._update();
},
@@ -692,7 +692,7 @@ L.GridLayer = L.Layer.extend({
if (!tile) { return; }
tile.loaded = +new Date();
- if (this._map._fadeAnimated && !this._skipFadeAnimated) {
+ if (this._map._fadeAnimated) {
L.DomUtil.setOpacity(tile.el, 0);
L.Util.cancelAnimFrame(this._fadeFrame);
this._fadeFrame =
L.Util.requestAnimFrame(this._updateOpacity, this);
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 37bbe44..dad1cea 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -419,11 +419,6 @@ L.TileLayer = L.GridLayer.extend({
key = this._tileCoordsToKey(coords);
var tile = this._tiles[key];
if (tile) {
- if (tile.el.src) {
- // cancel the animFade if there's any
- L.DomUtil.setOpacity(tile.el, 1);
- this._skipFadeAnimated = true;
- }
if (this._tiles[key]._invalidCount > 0) {
this._tiles[key]._invalidCount -= 1;
}
@@ -1025,7 +1020,6 @@ L.TileLayer = L.GridLayer.extend({
_onZoom: function (e) {
if (e.type === 'zoomstart') {
- this._skipFadeAnimated = true;
}
else if (e.type === 'zoomend') {
this._onUpdateCursor();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
