— Replace moment.js with Date().toLocaleDateString(…)

This commit is contained in:
Luc Didry 2023-12-25 07:11:03 +01:00
parent cd4168d2b8
commit 1d39f7b488
No known key found for this signature in database
GPG Key ID: EA868E12D0257E3C
11 changed files with 16 additions and 91 deletions

View File

@ -4,6 +4,7 @@ Revision history for Lufi
- ⬆️ — Update jQuery
- 🩹 — Fix a format query parameter
- 🎨 — Use template literals in js
- — Replace moment.js with Date().toLocaleDateString(…)
0.06.00 2023-12-18
- ⬆️ — Update deps

View File

@ -17,6 +17,16 @@ function escapeHtml(string) {
function changeLang() {
window.location = langUrl+$(this).val();
}
function formatDate(unixTimestamp) {
return new Date(unixTimestamp * 1000).toLocaleString(window.navigator.language, {
year: 'numeric',
month: 'long',
day: 'numeric',
weekday: 'long',
hour: '2-digit',
minute: '2-digit',
})
}
$(document).ready(function(){
$('select').material_select();
$(".select-lang select").on('change', changeLang);

View File

@ -207,8 +207,8 @@ function populateFilesTable() {
files.forEach(function(element, index, array) {
var del_view = (element.del_at_first_view) ? '<i class="small mdi-action-done"></i>' : '<i class="small mdi-navigation-close"></i>';
var dlink = `${actionURL}d/${element.short}/${element.token}`;
var limit = (element.delay === 0) ? i18n.noExpiration : moment.unix(element.delay * 86400 + element.created_at).locale(window.navigator.language).format('LLLL');
var created_at = moment.unix(element.created_at).locale(window.navigator.language).format('LLLL');
var limit = (element.delay === 0) ? i18n.noExpiration : formatDate(element.delay * 86400 + element.created_at);
var created_at = formatDate(element.created_at);
var tr = $(`<tr id="row-${element.short}">`);
tr.html(`<td class="center-align">

View File

@ -172,9 +172,7 @@ function fillModal() {
var content = '';
for (i = 0; i < files.length; i++) {
var f = files[i];
var expires = i18n.expiration.replace('XXX',
moment.unix(f.delay * 86400 + f.created_at).locale(window.navigator.language).format('LLLL')
);
var expires = i18n.expiration.replace('XXX', formatDate(f.delay * 86400 + f.created_at));
content += `<li>— <a href="${f.url}">${f.name}</a>
(${filesize(f.size)}, ${expires})
</li>`;

View File

@ -493,7 +493,7 @@ function updateProgressBar(data) {
var url = `${baseURL}r/${short}#${key}`;
var del_url = `${actionURL}d/${short}/${data.token}`;
var links = encodeURIComponent(`["${short}"]`);
var limit = (delay === 0) ? i18n.noLimit : i18n.expiration+' '+moment.unix(delay * 86400 + created_at).locale(window.navigator.language).format('LLLL');
var limit = (delay === 0) ? i18n.noLimit : `${i18n.expiration} ${formatDate(delay * 86400 + created_at)}`;
if (!isGuest) {
n.html(`${n.html()} ${s.html()} <a href="${actionURL}m?links=${links}"><i class="mdi-communication-email"></i></a><br>${limit}`);
d.html(`<div class="card-action">

File diff suppressed because one or more lines are too long

View File

@ -41,4 +41,3 @@
%= javascript '/partial/files.js'
%= javascript '/js/lufi-files.js'
%= javascript '/js/moment-with-locales.min.js'

View File

@ -162,7 +162,6 @@
%= javascript '/partial/index.js'
% }
%= javascript '/js/sjcl.js'
%= javascript '/js/moment-with-locales.min.js'
%= javascript '/js/filesize.min.js'
%= javascript '/js/jszip.min.js'
%= javascript '/js/lufi-notifications.js'

View File

@ -83,5 +83,4 @@
%= javascript '/partial/invitations.js'
%= javascript '/js/lufi-list-invitations.js'
%= javascript '/js/moment-with-locales.min.js'
%= javascript '/js/filesize.min.js'

View File

@ -50,4 +50,3 @@
</form>
<div>
%= javascript url_for('/partial/mail.js')->query(populate => (!defined(stash('msg')) && !defined(stash('values'))), links => $links)
%= javascript '/js/moment-with-locales.min.js'

View File

@ -36,7 +36,7 @@ function populateBody() {
links.forEach(function(name, index, array) {
var item = findItem(name);
if (item !== null && item !== undefined) {
var limit = (item.delay === 0) ? null : moment.unix(item.delay * 86400 + item.created_at).locale(window.navigator.language).format('LLLL');
var limit = (item.delay === 0) ? null : formatDate(item.delay * 86400 + item.created_at);
text += `- ${item.name}<%= l(':') %> ${item.url}`;
if (limit !== null) {
text += `\n (<%= l('deadline: ') %>${limit})`;