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

[Pranav Kant]

 loleaflet/src/layer/tile/TileLayer.js |    4 ++++
 loleaflet/src/map/Map.js              |    4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 25db37484cfa82bd38e3614f41119ebf382d1797
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri Nov 11 16:22:44 2016 +0530

    tdf#103697: Fix color value for spreadsheets and presentations
    
    Change-Id: I89f871f829abd847321bee927b98e9a96e8babbb

diff --git a/loleaflet/src/layer/tile/TileLayer.js b/loleaflet/src/layer/tile/TileLayer.js
index c167b28..d575413 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -769,6 +769,10 @@ L.TileLayer = L.GridLayer.extend({
 	},
 
 	_addView: function(viewId, userid, username, color) {
+		if (color === 0 && this._map.getDocType() !== 'text') {
+			color = L.LOUtil.getViewIdColor(viewId);
+		}
+
 		this._map.addView(viewId, userid, username, color);
 
 		//TODO: We can initialize color and other properties here.
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index e04866a..dba755f 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -390,10 +390,6 @@ L.Map = L.Evented.extend({
 	},
 
 	getViewColor: function(viewid) {
-		if (this._docLayer._docType !== 'text') {
-			return L.LOUtil.getViewIdColor(viewid);
-		}
-
 		return this._viewInfo[viewid].color;
 	},