Skip to content

Commit 4a55838

Browse files
fix(ui): import moment.js library with moment-timezone support in wrapper (ietf-tools#3977)
* fix: import moment.js library with moment-timezone support in wrapper Packaging changes broke the mechanism used to make moment.tz available to javascript code. This eliminates the separate moment.js and moment-timezone-with-data-10-year-range.js wrappers and instead imports the timezone-augmented version directly. This provides both the timezone support and the regular moment features. * refactor: put moment on window instead of global for consistency
1 parent 2b94db2 commit 4a55838

8 files changed

Lines changed: 6 additions & 10 deletions

File tree

ietf/static/js/moment-timezone-with-data-10-year-range.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

ietf/static/js/moment.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
const moment = require("moment");
2-
3-
global.moment = moment;
1+
/* Add the moment object to the global scope - needed until inline scripts using
2+
* Moment.js are eliminated. When that happens, can import moment in the js files
3+
* that need it. */
4+
import moment from "moment-timezone/builds/moment-timezone-with-data-10-year-range";
5+
window.moment = moment;

ietf/static/js/timezone.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111
(function () {
1212
'use strict';
13+
1314
// Callback for timezone change - called after current_timezone is updated
1415
let timezone_change_callback;
1516
let current_timezone;

ietf/templates/meeting/agenda.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,6 @@ <h2 class="mt-3">
428428
</script>
429429
<script src="{% static 'ietf/js/moment.js' %}">
430430
</script>
431-
<script src="{% static 'ietf/js/moment-timezone-with-data-10-year-range.js' %}">
432-
</script>
433431
<script src="{% static 'ietf/js/timezone.js' %}">
434432
</script>
435433
<script src="{% static 'ietf/js/agenda_materials.js' %}">

ietf/templates/meeting/edit_meeting_schedule.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
{% block title %}{{ schedule.name }}: IETF {{ meeting.number }} meeting agenda{% endblock %}
2626
{% block js %}
2727
<script src="{% static 'ietf/js/moment.js' %}"></script>
28-
<script src="{% static 'ietf/js/moment-timezone-with-data-10-year-range.js' %}"></script>
2928
<script src="{% static 'ietf/js/edit-meeting-schedule.js' %}"></script>
3029
{% endblock %}
3130
{% block content %}

ietf/templates/meeting/upcoming.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ <h3 class="my-3">No upcoming meetings</h3>
112112
<script src="{% static 'ietf/js/list.js' %}"></script>
113113
<script src="{% static 'ietf/js/fullcalendar.js' %}"></script>
114114
<script src="{% static 'ietf/js/moment.js' %}"></script>
115-
<script src="{% static 'ietf/js/moment-timezone-with-data-10-year-range.js' %}"></script>
116115
<script src="{% static 'ietf/js/agenda_filter.js' %}"></script>
117116
<script src="{% static 'ietf/js/agenda_materials.js' %}"></script>
118117
<script src="{% static 'ietf/js/timezone.js' %}"></script>

ietf/templates/meeting/week-view.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<meta name="viewport" content="width=device-width, initial-scale=1">
1313
<script src="{% static 'ietf/js/agenda_filter.js' %}"></script>
1414
<script src="{% static 'ietf/js/moment.js' %}"></script>
15-
<script src="{% static 'ietf/js/moment-timezone-with-data-10-year-range.js' %}"></script>
1615
<script src="{% static 'ietf/js/week-view.js' %}"></script>
1716
<script>
1817
var all_items = {{ items | safe }};

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
"ietf/static/js/manage-community-list.js",
8888
"ietf/static/js/manage-review-requests.js",
8989
"ietf/static/js/meeting-interim-request.js",
90-
"ietf/static/js/moment-timezone-with-data-10-year-range.js",
9190
"ietf/static/js/moment.js",
9291
"ietf/static/js/password_strength.js",
9392
"ietf/static/js/review-stats.js",

0 commit comments

Comments
 (0)