altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 4 Packages Projects Releases Wiki Activity

Merged in [19980] from personal/lars/7.40.1.dev0

Browse source 
Fix # 3555.
 - Legacy-Id: 19985
Note: SVN reference [19980] has been migrated to Git commit 686f835d4e
This commit is contained in:
Jennifer Richards 2022-02-24 17:40:24 +00:00
parent c5f86b3834 686f835d4e
commit 1d301f73f9
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ietf/static/js/upcoming.js
View file

@ -28,7 +28,7 @@ function filter_calendar_events(filter_params, event_list) {
} }
// format a moment in a tz // format a moment in a tz
var moment_formats = { time: 'HH:mm', date: 'YYYY-MM-DD', datetime: 'YYYY-MM-DD HH:mm' } var moment_formats = { time: 'HH:mm', date: 'YYYY-MM-DD', datetime: 'YYYY-MM-DD HH:mm' };
function format_moment(t_moment, tz, fmt_type) { function format_moment(t_moment, tz, fmt_type) {
return t_moment.tz(tz) return t_moment.tz(tz)
@ -77,13 +77,13 @@ function update_calendar(tz, filter_params) {
plugins: [dayGridPlugin], plugins: [dayGridPlugin],
initialView: 'dayGridMonth', initialView: 'dayGridMonth',
displayEventTime: false, displayEventTime: false,
events: function (fInfo, success) { success(display_events) }, events: function (fInfo, success) { success(display_events); },
eventDidMount: function (info) { eventDidMount: function (info) {
$(info.el) $(info.el)
.tooltip({ title: info.event.title }) .tooltip({ title: info.event.title });
}, },
eventDisplay: 'block' eventDisplay: 'block'
}) });
event_calendar.render(); event_calendar.render();
} }
} }
@ -138,6 +138,10 @@ function format_meeting_time(meeting_elt, tz) {
} }
window.timezone_changed = function (newtz) { window.timezone_changed = function (newtz) {
if (!newtz) {
ietf_timezone.initialize('local');
newtz = ietf_timezone.get_current_tz();
}
// update times for events in the table // update times for events in the table
if (current_tz !== newtz) { if (current_tz !== newtz) {
current_tz = newtz; current_tz = newtz;