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

[Pranav Kant]

 loleaflet/src/core/LOUtil.js          |    1 -
 loleaflet/src/layer/tile/TileLayer.js |    8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit ef878326b7a3a8fbf6f9203c58618ed1a8f64dd1
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu Aug 11 17:34:36 2016 +0530

    loleaflet: Remove hack for viewid=0
    
    This is not needed now, as fixed in loolwsd.

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index f76128b..62c2f1b 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -525,8 +525,8 @@ L.TileLayer = L.GridLayer.extend({
 		var obj = JSON.parse(textMsg);
 		var viewId = parseInt(obj.viewId);
 
-		// Ignore if viewid=0 or is same as ours
-		if (viewId === 0 || viewId === this._viewId) {
+		// Ignore if viewid is same as ours
+		if (viewId === this._viewId) {
 			return;
 		}
 
@@ -550,8 +550,8 @@ L.TileLayer = L.GridLayer.extend({
 		var obj = JSON.parse(textMsg);
 		var viewId = parseInt(obj.viewId);
 
-		// Ignore if viewid=0 or is same as ours
-		if (viewId === 0 || viewId === this._viewId) {
+		// Ignore if viewid is same as ours
+		if (viewId === this._viewId) {
 			return;
 		}
 
commit 8a55ab1ee5e2751070ce13a648cb18809b51bc78
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu Aug 11 17:33:15 2016 +0530

    loleaflet: Remove 'black' color from list of cursor dark colors
    
    Black is reserved for current view's cursor.

diff --git a/loleaflet/src/core/LOUtil.js b/loleaflet/src/core/LOUtil.js
index 8b11379..24c516b 100644
--- a/loleaflet/src/core/LOUtil.js
+++ b/loleaflet/src/core/LOUtil.js
@@ -8,7 +8,6 @@ L.LOUtil = {
 	// Maybe move the color logic to separate file when it becomes complex
 	darkColors: [
 		[198, 146, 0],
-		[6,  70, 162],
 		[87, 157,  28],
 		[105,  43, 157],
 		[197,   0,  11],