From 853fd906cbf6f07a0c3dd68494a23fe01986e3d3 Mon Sep 17 00:00:00 2001 From: Haocen Xu Date: Thu, 21 Nov 2019 12:25:32 -0500 Subject: [PATCH 1/2] Fix unnecessary closure capture --- js/privatebin.js | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/js/privatebin.js b/js/privatebin.js index 6ddbf115..eea87678 100644 --- a/js/privatebin.js +++ b/js/privatebin.js @@ -3669,25 +3669,21 @@ jQuery.PrivateBin = (function($, RawDeflate) { const $emailconfirmTimezoneCurrent = $emailconfirmmodal.find('#emailconfirm-timezone-current'); const $emailconfirmTimezoneUtc = $emailconfirmmodal.find('#emailconfirm-timezone-utc'); $emailconfirmTimezoneCurrent.off('click.sendEmailCurrentTimezone'); - $emailconfirmTimezoneCurrent.on('click.sendEmailCurrentTimezone', function(expirationDateRoundedToSecond, isBurnafterreading) { - return function() { - const emailBody = templateEmailBody(expirationDateRoundedToSecond.toLocaleString(), isBurnafterreading); - $emailconfirmmodal.modal('hide'); - triggerEmailSend(emailBody); - }; - } (expirationDateRoundedToSecond, isBurnafterreading)); + $emailconfirmTimezoneCurrent.on('click.sendEmailCurrentTimezone', () => { + const emailBody = templateEmailBody(expirationDateRoundedToSecond.toLocaleString(), isBurnafterreading); + $emailconfirmmodal.modal('hide'); + triggerEmailSend(emailBody); + }); $emailconfirmTimezoneUtc.off('click.sendEmailUtcTimezone'); - $emailconfirmTimezoneUtc.on('click.sendEmailUtcTimezone', function(expirationDateRoundedToSecond, isBurnafterreading) { - return function() { - const emailBody = templateEmailBody(expirationDateRoundedToSecond.toLocaleString( - undefined, - // we don't use Date.prototype.toUTCString() because we would like to avoid GMT - { timeZone: 'UTC', dateStyle: 'long', timeStyle: 'long' } - ), isBurnafterreading); - $emailconfirmmodal.modal('hide'); - triggerEmailSend(emailBody); - }; - } (expirationDateRoundedToSecond, isBurnafterreading)); + $emailconfirmTimezoneUtc.on('click.sendEmailUtcTimezone', () => { + const emailBody = templateEmailBody(expirationDateRoundedToSecond.toLocaleString( + undefined, + // we don't use Date.prototype.toUTCString() because we would like to avoid GMT + { timeZone: 'UTC', dateStyle: 'long', timeStyle: 'long' } + ), isBurnafterreading); + $emailconfirmmodal.modal('hide'); + triggerEmailSend(emailBody); + }); $emailconfirmmodal.modal('show'); } else { triggerEmailSend(templateEmailBody(null, isBurnafterreading)); @@ -3863,11 +3859,9 @@ jQuery.PrivateBin = (function($, RawDeflate) { $emailLink.removeClass('hidden'); $emailLink.off('click.sendEmail'); - $emailLink.on('click.sendEmail', function(expirationDate, isBurnafterreading) { - return function() { - sendEmail(expirationDate, isBurnafterreading); - }; - } (expirationDate, isBurnafterreading)); + $emailLink.on('click.sendEmail', () => { + sendEmail(expirationDate, isBurnafterreading); + }); } catch (error) { console.error(error); Alert.showError( From 87cf61c39bbe04627f5d66c37402779af5b0c2b4 Mon Sep 17 00:00:00 2001 From: Haocen Xu Date: Thu, 21 Nov 2019 17:49:21 -0500 Subject: [PATCH 2/2] Update SRI --- tpl/bootstrap.php | 2 +- tpl/page.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php index 7148a558..0d095e29 100644 --- a/tpl/bootstrap.php +++ b/tpl/bootstrap.php @@ -72,7 +72,7 @@ endif; ?> - + diff --git a/tpl/page.php b/tpl/page.php index 604a7f4e..5f13e778 100644 --- a/tpl/page.php +++ b/tpl/page.php @@ -50,7 +50,7 @@ endif; ?> - +