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

[Jan Holesovsky]

 loleaflet/src/layer/tile/GridLayer.js |    9 ---------
 loleaflet/src/layer/tile/TileLayer.js |   16 ----------------
 2 files changed, 25 deletions(-)

New commits:
commit 29ba14178e363034d785fc03414db07c5b6e4594
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Sat May 30 23:27:58 2015 +0200

    Kill _abortLoading, causes loss of tiles in various scenarios.
    
    loleaflet only triggers the loading of the tile, and the tile comes sooner or
    later whatever we do, so the idea of aborting the loading does not work until
    we have server support for that anyway - let's just kill that for now.

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index a4ee0b4..9feb8f1 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -332,22 +332,6 @@ L.TileLayer = L.GridLayer.extend({
 		e.tile.onload = null;
 	},
 
-	// stops loading all tiles in the background layer
-	_abortLoading: function () {
-		var i, tile;
-		for (i in this._tiles) {
-			tile = this._tiles[i].el;
-
-			tile.onload = L.Util.falseFn;
-			tile.onerror = L.Util.falseFn;
-
-			if (!tile.complete) {
-				tile.src = L.Util.emptyImageUrl;
-				L.DomUtil.remove(tile);
-			}
-		}
-	},
-
 	_rectanglesToPolygons: function(rectangles) {
 		// algorithm found here http://stackoverflow.com/questions/13746284/merging-multiple-adjacent-rectangles-into-one-polygon
 		var eps = 20;
commit 128bfcec10a4c375cddb19ac583326af8b7384f0
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri May 29 22:22:14 2015 +0200

    Never ignore scroll.
    
    After 'make clear-cache', sometimes causes losing scroll events (the user
    moves the scrollbar, but the document does not move).

diff --git a/loleaflet/src/layer/tile/GridLayer.js b/loleaflet/src/layer/tile/GridLayer.js
index a3700e8..46fc6e7 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -370,10 +370,6 @@ L.GridLayer = L.Layer.extend({
 			bottomRight = this._map.unproject(bottomRight);
 			this._map.setMaxBounds(new L.LatLngBounds(topLeft, bottomRight));
 		}
-		else {
-			// the scroll container will get updated so we ignore scroll events
-			this._ignoreScroll = true;
-		}
 		L.DomUtil.setStyle(this._map._mockDoc, 'width', docPixelLimits.x + 'px');
 		L.DomUtil.setStyle(this._map._mockDoc, 'height', docPixelLimits.y + 'px');
 	},
@@ -387,7 +383,6 @@ L.GridLayer = L.Layer.extend({
 			var y = newScrollPos.y < 0 ? 0 : newScrollPos.y;
 			this._prevScrollY = y;
 			this._prevScrollX = x;
-			this._ignoreScroll = false;
 			$('#scroll-container').mCustomScrollbar('scrollTo', [y, x], {callbacks: false, timeout:0});
 		}
 	},
@@ -730,9 +725,6 @@ L.GridLayer = L.Layer.extend({
 	},
 
 	_onScroll: function (evt) {
-		if (this._ignoreScroll) {
-			return;
-		}
 		if (this._prevScrollY === undefined) {
 			this._prevScrollY = 0;
 		}
@@ -753,7 +745,6 @@ L.GridLayer = L.Layer.extend({
 	_onScrollEnd: function (evt) {
 		this._prevScrollY = -evt.mcs.top;
 		this._prevScrollX = -evt.mcs.left;
-		this._ignoreScroll = false;
 	}
 });