loleaflet/src/layer/marker/Annotation.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8fdf8d38292a29e1299a0f329b59c3597d54a0b7
Author: Jan Holesovsky <ke...@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
Reviewed-on: https://gerrit.libreoffice.org/37019
Reviewed-by: Marco Cecchetti <mrcek...@gmail.com>
Tested-by: Marco Cecchetti <mrcek...@gmail.com>
diff --git a/loleaflet/src/layer/marker/Annotation.js
b/loleaflet/src/layer/marker/Annotation.js
index a7e06a04..253b698b 100644
--- a/loleaflet/src/layer/marker/Annotation.js
+++ b/loleaflet/src/layer/marker/Annotation.js
@@ -283,7 +283,7 @@ L.Annotation = L.Layer.extend({
this._contentText.innerHTML = this._nodeModifyText.innerHTML =
this._data.text;
this._contentAuthor.innerHTML = this._data.author;
- 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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
