From 5d37cc703b2d3f100ca5c2c73fd456739cd80dd9 Mon Sep 17 00:00:00 2001 From: Jon Dufresne Date: Mon, 20 Apr 2020 17:39:15 -0700 Subject: Fixed #31493 -- Replaced var with const and let keywords in JavaScript. The eslint configuration and the admin script compress.py have been updated for ES6. The unused fallback of globals.django in jquery.init.js was removed. It is always included before jsi18n-mocks.test.js and it always sets the global value. --- js_tests/admin/DateTimeShortcuts.test.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'js_tests/admin/DateTimeShortcuts.test.js') diff --git a/js_tests/admin/DateTimeShortcuts.test.js b/js_tests/admin/DateTimeShortcuts.test.js index dfd5f231af..382673602b 100644 --- a/js_tests/admin/DateTimeShortcuts.test.js +++ b/js_tests/admin/DateTimeShortcuts.test.js @@ -5,14 +5,14 @@ QUnit.module('admin.DateTimeShortcuts'); QUnit.test('init', function(assert) { - var $ = django.jQuery; + const $ = django.jQuery; - var dateField = $('
'); + const dateField = $('
'); $('#qunit-fixture').append(dateField); DateTimeShortcuts.init(); - var shortcuts = $('.datetimeshortcuts'); + const shortcuts = $('.datetimeshortcuts'); assert.equal(shortcuts.length, 1); assert.equal(shortcuts.find('a:first').text(), 'Today'); assert.equal(shortcuts.find('a:last .date-icon').length, 1); @@ -23,8 +23,8 @@ QUnit.test('init', function(assert) { }); QUnit.test('custom time shortcuts', function(assert) { - var $ = django.jQuery; - var timeField = $(''); + const $ = django.jQuery; + const timeField = $(''); $('#qunit-fixture').append(timeField); DateTimeShortcuts.clockHours.time_test = [['3 a.m.', 3]]; DateTimeShortcuts.init(); @@ -32,9 +32,9 @@ QUnit.test('custom time shortcuts', function(assert) { }); QUnit.test('time zone offset warning', function(assert) { - var $ = django.jQuery; - var savedOffset = $('body').attr('data-admin-utc-offset'); - var timeField = $(''); + const $ = django.jQuery; + const savedOffset = $('body').attr('data-admin-utc-offset'); + const timeField = $(''); $('#qunit-fixture').append(timeField); $('body').attr('data-admin-utc-offset', new Date().getTimezoneOffset() * -60 + 3600); DateTimeShortcuts.init(); -- cgit v1.3