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

[Jan Holesovsky]

 loleaflet/src/layer/marker/Annotation.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5a164b3c6a39631c113f7a349ceb9bf44cf38486
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Apr 27 10:15:05 2017 +0200

    comments: Don't trust the date parsing in Calc.
    
    The Calc returns dates differently according to locale, which terribly
    confuses IE11.
    
    Change-Id: I80e70cae0091e7eeba782e43e666817f29c1a11f

diff --git a/loleaflet/src/layer/marker/Annotation.js b/loleaflet/src/layer/marker/Annotation.js
index 34b00ea1..44e41751 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -287,7 +287,7 @@ L.Annotation = L.Layer.extend({
 		this._contentAuthor.innerHTML = this._data.author;
 
 		var d = new Date(this._data.dateTime.replace(/,.*/, 'Z'));
-		this._contentDate.innerHTML = isNaN(d.getTime())? this._data.dateTime: d.toDateString();
+		this._contentDate.innerHTML = (isNaN(d.getTime()) || this._map.getDocType() === 'spreadsheet')? this._data.dateTime: d.toDateString();
 
 		if (this._data.trackchange) {
 			this._captionText.innerHTML = this._data.description;