loleaflet/main.js | 1 + loleaflet/node_shrinkwrap/timeago-1.5.3.tgz |binary loleaflet/npm-shrinkwrap.json | 5 +++++ loleaflet/package.json | 1 + loleaflet/src/control/Control.DocumentRepair.js | 3 ++- 5 files changed, 9 insertions(+), 1 deletion(-)
New commits: commit 655915da052ee45d7d8b2d961ee01afc72d605af Author: Miklos Vajna <vmik...@collabora.co.uk> Date: Fri Sep 30 16:52:03 2016 +0200 leaflet: bundle timeago JS module And start using it in DocumentRepair. Change-Id: I8d2b8af4d2e0dcc7cf8082c9d7adbc633df1c387 diff --git a/loleaflet/main.js b/loleaflet/main.js index c2851d6..3074bdf 100644 --- a/loleaflet/main.js +++ b/loleaflet/main.js @@ -7,6 +7,7 @@ global.$ = global.jQuery = $; require('smartmenus'); require('jquery-ui'); require('jquery-contextmenu'); +require('timeago'); // FIXME: would be good to remove w2ui script tags and require // like other modules. problem is that w2ui doesn't export // its global variables for a module, so following doesn't work diff --git a/loleaflet/node_shrinkwrap/timeago-1.5.3.tgz b/loleaflet/node_shrinkwrap/timeago-1.5.3.tgz new file mode 100644 index 0000000..eefea77 Binary files /dev/null and b/loleaflet/node_shrinkwrap/timeago-1.5.3.tgz differ diff --git a/loleaflet/npm-shrinkwrap.json b/loleaflet/npm-shrinkwrap.json index b7a7733..2e889cf 100644 --- a/loleaflet/npm-shrinkwrap.json +++ b/loleaflet/npm-shrinkwrap.json @@ -2385,6 +2385,11 @@ "from": "smartmenus@1.0.0", "resolved": "./node_shrinkwrap/smartmenus-1.0.0.tgz" }, + "timeago": { + "version": "1.5.3", + "from": "timeago@1.5.3", + "resolved": "./node_shrinkwrap/timeago-1.5.3.tgz" + }, "uglify-js": { "version": "2.4.24", "from": "uglify-js@>=2.4.16 <2.5.0", diff --git a/loleaflet/package.json b/loleaflet/package.json index 91fdffa..c0b144d 100644 --- a/loleaflet/package.json +++ b/loleaflet/package.json @@ -32,6 +32,7 @@ "select2": "4.0.1", "shrinkpack": "^0.13.1", "smartmenus": "1.0.0", + "timeago": "1.5.3", "uglify-js": "~2.4.16", "uglifyify": "3.0.2", "vex-js": "2.3.2", diff --git a/loleaflet/src/control/Control.DocumentRepair.js b/loleaflet/src/control/Control.DocumentRepair.js index 5176ea2..91d01a0 100644 --- a/loleaflet/src/control/Control.DocumentRepair.js +++ b/loleaflet/src/control/Control.DocumentRepair.js @@ -67,7 +67,8 @@ L.Control.DocumentRepair = L.Control.extend({ td = L.DomUtil.create('td', '', row); td.appendChild(document.createTextNode(viewId)); td = L.DomUtil.create('td', '', row); - td.appendChild(document.createTextNode(dateTime)); + var relativeDateTime = jQuery.timeago(dateTime.replace(/,.*/, 'Z')); + td.appendChild(document.createTextNode(relativeDateTime)); L.DomEvent.on(row, 'click', this._onRowClick, this); L.DomEvent.on(row, 'dblclick', this._onJumpClick, this); }, _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits