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

[Tor Lillqvist]

 loleaflet/src/core/Socket.js          |    3 ---
 loleaflet/src/layer/tile/GridLayer.js |    4 ++--
 loleaflet/src/layer/tile/TileLayer.js |    4 +---
 3 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 8828e7ebb10e691ddc91abadaa1bb233336953cf
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jan 4 12:06:50 2017 +0200

    Bin dead code
    
    Nothing adds any prefetch= parameter to a message anywhere any longer.
    Presumably this went away in 5d6ab6e8dc4fef41c649280b5c61b502cf030869.
    Thus also the preFetch field is dead.
    
    Change-Id: Ide586a702277e77c9b7bf37edd01def4aaf3ace1

diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 4937a35..e778df9 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -563,9 +563,6 @@ L.Socket = L.Class.extend({
 				// remove newline characters
 				command.type = tokens[i].substring(5).replace(/(\r\n|\n|\r)/gm, '');
 			}
-			else if (tokens[i].substring(0, 9) === 'prefetch=') {
-				command.preFetch = tokens[i].substring(9);
-			}
 			else if (tokens[i].substring(0, 4) === 'cmd=') {
 				command.errorCmd = tokens[i].substring(4);
 			}
diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 91a5921..5c5a2d3 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1146,9 +1146,6 @@ L.TileLayer = L.GridLayer.extend({
 			}
 			tile.el.src = img;
 		}
-		else if (command.preFetch === 'true') {
-			this._tileCache[key] = img;
-		}
 		L.Log.log(textMsg, L.INCOMING, key);
 	},
 
commit 6d276ef2c64831de40cd7bbb0c657d9b813aa960
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jan 4 12:03:35 2017 +0200

    Fix misleading comment: There is nothing commented out here any more
    
    Change-Id: I3450bce7f7ad2115719fb198b28062f57f4f6b81

diff --git a/loleaflet/src/layer/tile/GridLayer.js b/loleaflet/src/layer/tile/GridLayer.js
index c83eca1..8076abb 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -748,8 +748,7 @@ L.GridLayer = L.Layer.extend({
 		if (!tile) { return; }
 
 		// FIXME: this _tileCache is used for prev/next slide; but it is
-		// dangerous in connection with typing / invalidation, so let's
-		// comment it out for now
+		// dangerous in connection with typing / invalidation
 		if (!(this._tiles[key]._invalidCount > 0)) {
 			this._tileCache[key] = tile.el.src;
 		}
commit 04e29315835fa0a8e6a8d18486d63ac139879e9e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jan 4 11:20:17 2017 +0200

    Add Emacs mode line
    
    Change-Id: I2ac8e460a5884c74e8ee3a90831f0268a4d7442a

diff --git a/loleaflet/src/layer/tile/GridLayer.js b/loleaflet/src/layer/tile/GridLayer.js
index 9f675d1..c83eca1 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -1,3 +1,4 @@
+/* -*- js-indent-level: 8 -*- */
 /*
  * L.GridLayer is used as base class for grid-like layers like TileLayer.
  */
diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index 0f5ca9f..91a5921 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1,3 +1,4 @@
+/* -*- js-indent-level: 8 -*- */
 /*
  * L.TileLayer is used for standard xyz-numbered tile layers.
  */