From 1439bb291ffa16477e32b1b49251f090d3d4f543 Mon Sep 17 00:00:00 2001 From: El RIDO Date: Sat, 21 Mar 2020 16:53:55 +0100 Subject: [PATCH] allow pasting password on paste with attachment - big kudos @rugk for finding it! - fixes #565, fixes #595 --- CHANGELOG.md | 1 + js/privatebin.js | 3 ++- tpl/bootstrap.php | 2 +- tpl/page.php | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbc8174..48fe265 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * CHANGED: Upgrading libraries to: identicon 2.0.0 * FIXED: Support custom expiration options in email function (#586) * FIXED: Regression with encoding of HTML entities (#588) + * FIXED: Unable to paste password on paste with attachment (#565 & #595) * **1.3.3 (2020-02-16)** * CHANGED: Upgrading libraries to: DOMpurify 2.0.8 * CHANGED: Several translations got updated with missing messages diff --git a/js/privatebin.js b/js/privatebin.js index c6b98b9..974b4c5 100644 --- a/js/privatebin.js +++ b/js/privatebin.js @@ -3447,6 +3447,7 @@ jQuery.PrivateBin = (function($, RawDeflate) { if (fadeOut === true) { setTimeout(function () { $comment.removeClass('highlight'); + }, 300); } }; @@ -4249,7 +4250,7 @@ jQuery.PrivateBin = (function($, RawDeflate) { */ me.isAttachmentReadonly = function() { - return $attach.hasClass('hidden'); + return createButtonsDisplayed && $attach.hasClass('hidden'); } /** diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php index e9853f2..39d5049 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 f54170e..7500eca 100644 --- a/tpl/page.php +++ b/tpl/page.php @@ -50,7 +50,7 @@ endif; ?> - +