fix(ui): import moment.js library with moment-timezone support in wrapper (#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
This commit is contained in:
Jennifer Richards 2022-05-18 11:23:07 -03:00 committed by GitHub
parent 2b94db2161
commit 4a5583845e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 6 additions and 10 deletions

View file

@ -1 +0,0 @@
import "moment-timezone/builds/moment-timezone-with-data-10-year-range";

View file

@ -1,3 +1,5 @@
const moment = require("moment");
global.moment = moment;
/* Add the moment object to the global scope - needed until inline scripts using
* Moment.js are eliminated. When that happens, can import moment in the js files
* that need it. */
import moment from "moment-timezone/builds/moment-timezone-with-data-10-year-range";
window.moment = moment;

View file

@ -10,6 +10,7 @@
*/
(function () {
'use strict';
// Callback for timezone change - called after current_timezone is updated
let timezone_change_callback;
let current_timezone;

View file

@ -428,8 +428,6 @@
</script>
<script src="{% static 'ietf/js/moment.js' %}">
</script>
<script src="{% static 'ietf/js/moment-timezone-with-data-10-year-range.js' %}">
</script>
<script src="{% static 'ietf/js/timezone.js' %}">
</script>
<script src="{% static 'ietf/js/agenda_materials.js' %}">

View file

@ -25,7 +25,6 @@
{% block title %}{{ schedule.name }}: IETF {{ meeting.number }} meeting agenda{% endblock %}
{% block js %}
<script src="{% static 'ietf/js/moment.js' %}"></script>
<script src="{% static 'ietf/js/moment-timezone-with-data-10-year-range.js' %}"></script>
<script src="{% static 'ietf/js/edit-meeting-schedule.js' %}"></script>
{% endblock %}
{% block content %}

View file

@ -112,7 +112,6 @@
<script src="{% static 'ietf/js/list.js' %}"></script>
<script src="{% static 'ietf/js/fullcalendar.js' %}"></script>
<script src="{% static 'ietf/js/moment.js' %}"></script>
<script src="{% static 'ietf/js/moment-timezone-with-data-10-year-range.js' %}"></script>
<script src="{% static 'ietf/js/agenda_filter.js' %}"></script>
<script src="{% static 'ietf/js/agenda_materials.js' %}"></script>
<script src="{% static 'ietf/js/timezone.js' %}"></script>

View file

@ -12,7 +12,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<script src="{% static 'ietf/js/agenda_filter.js' %}"></script>
<script src="{% static 'ietf/js/moment.js' %}"></script>
<script src="{% static 'ietf/js/moment-timezone-with-data-10-year-range.js' %}"></script>
<script src="{% static 'ietf/js/week-view.js' %}"></script>
<script>
var all_items = {{ items | safe }};

View file

@ -87,7 +87,6 @@
"ietf/static/js/manage-community-list.js",
"ietf/static/js/manage-review-requests.js",
"ietf/static/js/meeting-interim-request.js",
"ietf/static/js/moment-timezone-with-data-10-year-range.js",
"ietf/static/js/moment.js",
"ietf/static/js/password_strength.js",
"ietf/static/js/review-stats.js",