[Libreoffice-commits] online.git: loleaflet/src
Miklos Vajna
vmiklos at collabora.co.uk
Fri Sep 30 15:45:23 UTC 2016
loleaflet/src/control/Control.DocumentRepair.js | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 81a114c47d7df9271c67dd4acd4d7c164ebef9be
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Sep 30 17:44:15 2016 +0200
DocumentRepair: still show the absolute time as a tooltip
Change-Id: I64cbf519e53c2a2ad697deb9932fb7a32e702d25
diff --git a/loleaflet/src/control/Control.DocumentRepair.js b/loleaflet/src/control/Control.DocumentRepair.js
index 91d01a0..8ff56b6 100644
--- a/loleaflet/src/control/Control.DocumentRepair.js
+++ b/loleaflet/src/control/Control.DocumentRepair.js
@@ -66,16 +66,23 @@ L.Control.DocumentRepair = L.Control.extend({
td.appendChild(document.createTextNode(comment));
td = L.DomUtil.create('td', '', row);
td.appendChild(document.createTextNode(viewId));
+
+ // Show relative date by default, absolute one as tooltip.
td = L.DomUtil.create('td', '', row);
var relativeDateTime = jQuery.timeago(dateTime.replace(/,.*/, 'Z'));
- td.appendChild(document.createTextNode(relativeDateTime));
+ var span = document.createElement('span');
+ span.title = dateTime;
+ span.appendChild(document.createTextNode(relativeDateTime));
+ td.appendChild(span);
+
L.DomEvent.on(row, 'click', this._onRowClick, this);
L.DomEvent.on(row, 'dblclick', this._onJumpClick, this);
},
fillAction: function (actions, type) {
for (var iterator = 0; iterator < actions.length; ++iterator) {
- var userName = actions[iterator].userName;
+ // No user name if the user in question is already disconnected.
+ var userName = actions[iterator].userName ? actions[iterator].userName : '';
if (parseInt(actions[iterator].viewId) === this._map._docLayer._viewId) {
userName = _('You');
}
More information about the Libreoffice-commits
mailing list