diff --git a/img/bootstrap-icons.svg b/img/bootstrap-icons.svg index 11afeae1..18390345 100644 --- a/img/bootstrap-icons.svg +++ b/img/bootstrap-icons.svg @@ -1 +1 @@ - + diff --git a/js/privatebin.js b/js/privatebin.js index 483eb333..9be68849 100644 --- a/js/privatebin.js +++ b/js/privatebin.js @@ -2120,8 +2120,8 @@ jQuery.PrivateBin = (function($, RawDeflate) { $pasteUrl.click(pasteLinkClick); // delete link - $('#deletelink').html(''); - I18n._($('#deletelink a').first(), 'Delete data'); + $('#deletelink').attr('href', deleteUrl); + I18n._($('#deletelink span').not('.glyphicon').first(), 'Delete data'); // enable shortener button $shortenButton.removeClass('buttondisabled'); diff --git a/js/test/PasteStatus.js b/js/test/PasteStatus.js index a233bb48..74846b4b 100644 --- a/js/test/PasteStatus.js +++ b/js/test/PasteStatus.js @@ -30,11 +30,11 @@ describe('PasteStatus', function () { const expected1 = common.urlToString(url1).replace(/&(gt|lt)$/, '&$1a'), expected2 = common.urlToString(url2).replace(/&(gt|lt)$/, '&$1a'), clean = jsdom(); - $('body').html('
'); + $('body').html(''); $.PrivateBin.PasteStatus.init(); $.PrivateBin.PasteStatus.createPasteNotification(expected1, expected2); const result1 = $('#pasteurl')[0].href, - result2 = $('#deletelink a')[0].href; + result2 = $('#deletelink')[0].href; clean(); return result1 === expected1 && result2 === expected2; } diff --git a/lib/Configuration.php b/lib/Configuration.php index 2dba64ac..c9f0ee8f 100644 --- a/lib/Configuration.php +++ b/lib/Configuration.php @@ -108,7 +108,7 @@ class Configuration 'js/kjua-0.9.0.js' => 'sha512-CVn7af+vTMBd9RjoS4QM5fpLFEOtBCoB0zPtaqIDC7sF4F8qgUSRFQQpIyEDGsr6yrjbuOLzdf20tkHHmpaqwQ==', 'js/legacy.js' => 'sha512-UxW/TOZKon83n6dk/09GsYKIyeO5LeBHokxyIq+r7KFS5KMBeIB/EM7NrkVYIezwZBaovnyNtY2d9tKFicRlXg==', 'js/prettify.js' => 'sha512-puO0Ogy++IoA2Pb9IjSxV1n4+kQkKXYAEUtVzfZpQepyDPyXk8hokiYDS7ybMogYlyyEIwMLpZqVhCkARQWLMg==', - 'js/privatebin.js' => 'sha512-cCt3Slm10JXtPJhgmYdf1RKO7uWdz6U+k0bdPjTYfdO6WeWfruN9RkJE7tKmpgw8A35H4Xifmrr2KmyVOMbc3g==', + 'js/privatebin.js' => 'sha512-vNl2M1Ev+317XYqNW5U0jDvqOLjdTe2jepqWfPEZus21sLPSqeeG9PxYUugLWf7rrzozoTl8weDDhwMczIyq6w==', 'js/purify-3.1.7.js' => 'sha512-LegvqULiMtOfboJZw9MpETN/b+xnLRXZI90gG7oIFHW+yAeHmKvRtEUbiMFx2WvUqQoL9XB3gwU+hWXUT0X+8A==', 'js/rawinflate-0.3.js' => 'sha512-g8uelGgJW9A/Z1tB6Izxab++oj5kdD7B4qC7DHwZkB6DGMXKyzx7v5mvap2HXueI2IIn08YlRYM56jwWdm2ucQ==', 'js/showdown-2.1.0.js' => 'sha512-WYXZgkTR0u/Y9SVIA4nTTOih0kXMEd8RRV6MLFdL6YU8ymhR528NLlYQt1nlJQbYz4EW+ZsS0fx1awhiQJme1Q==', diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php index f4780797..fa9296c6 100644 --- a/tpl/bootstrap.php +++ b/tpl/bootstrap.php @@ -535,12 +535,17 @@ if ($HTTPWARNING) : endif; ?>