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:
parent
2b94db2161
commit
4a5583845e
|
@ -1 +0,0 @@
|
|||
import "moment-timezone/builds/moment-timezone-with-data-10-year-range";
|
|
@ -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;
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
*/
|
||||
(function () {
|
||||
'use strict';
|
||||
|
||||
// Callback for timezone change - called after current_timezone is updated
|
||||
let timezone_change_callback;
|
||||
let current_timezone;
|
||||
|
|
|
@ -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' %}">
|
||||
|
|
|
@ -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 %}
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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 }};
|
||||
|
|
|
@ -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",
|
||||
|
|
Loading…
Reference in a new issue