Reset attachment when clicking new paste
This commit is contained in:
parent
fc1be18cbe
commit
5ece4d2632
1 changed files with 34 additions and 22 deletions
|
@ -18,14 +18,14 @@ jQuery.fn.draghover = function() {
|
|||
return this.each(function() {
|
||||
let collection = $(),
|
||||
self = $(this);
|
||||
|
||||
|
||||
self.on('dragenter', function(e) {
|
||||
if (collection.length === 0) {
|
||||
self.trigger('draghoverstart');
|
||||
}
|
||||
collection = collection.add(e.target);
|
||||
});
|
||||
|
||||
|
||||
self.on('dragleave drop', function(e) {
|
||||
collection = collection.not(e.target);
|
||||
if (collection.length === 0) {
|
||||
|
@ -519,7 +519,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
|
|||
|
||||
/**
|
||||
* calculate expiration date given initial date and expiration period
|
||||
*
|
||||
*
|
||||
* @name Helper.calculateExpirationDate
|
||||
* @function
|
||||
* @param {Date} initialDate - may not be empty
|
||||
|
@ -532,7 +532,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
|
|||
if (typeof expirationDisplayStringOrSecondsToExpire === 'string') {
|
||||
secondsToExpiration = me.durationToSeconds(expirationDisplayStringOrSecondsToExpire);
|
||||
}
|
||||
|
||||
|
||||
if (typeof secondsToExpiration !== 'number') {
|
||||
throw new Error('Cannot calculate expiration date.');
|
||||
}
|
||||
|
@ -3695,9 +3695,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
|
|||
// in any case, remove saved attachment data
|
||||
AttachmentViewer.removeAttachmentData();
|
||||
|
||||
// hide UI for selected files
|
||||
// our up-to-date jQuery can handle it :)
|
||||
$fileWrap.find('input').val('');
|
||||
me.clearAttachmentInput();
|
||||
AttachmentViewer.clearDragAndDrop();
|
||||
|
||||
// pevent '#' from appearing in the URL
|
||||
|
@ -3722,11 +3720,11 @@ jQuery.PrivateBin = (function($, RawDeflate) {
|
|||
|
||||
/**
|
||||
* Template Email body.
|
||||
*
|
||||
*
|
||||
* @name TopNav.templateEmailBody
|
||||
* @private
|
||||
* @param {string} expirationDateString
|
||||
* @param {bool} isBurnafterreading
|
||||
* @private
|
||||
* @param {string} expirationDateString
|
||||
* @param {bool} isBurnafterreading
|
||||
*/
|
||||
function templateEmailBody(expirationDateString, isBurnafterreading)
|
||||
{
|
||||
|
@ -3764,10 +3762,10 @@ jQuery.PrivateBin = (function($, RawDeflate) {
|
|||
|
||||
/**
|
||||
* Trigger Email send.
|
||||
*
|
||||
*
|
||||
* @name TopNav.triggerEmailSend
|
||||
* @private
|
||||
* @param {string} emailBody
|
||||
* @private
|
||||
* @param {string} emailBody
|
||||
*/
|
||||
function triggerEmailSend(emailBody)
|
||||
{
|
||||
|
@ -3980,7 +3978,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
|
|||
|
||||
/**
|
||||
* show the "email" button
|
||||
*
|
||||
*
|
||||
* @name TopNav.showEmailbutton
|
||||
* @function
|
||||
* @param {int|undefined} optionalRemainingTimeInSeconds
|
||||
|
@ -4008,7 +4006,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
|
|||
|
||||
/**
|
||||
* hide the "email" button
|
||||
*
|
||||
*
|
||||
* @name TopNav.hideEmailButton
|
||||
* @function
|
||||
*/
|
||||
|
@ -4042,7 +4040,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
|
|||
|
||||
/**
|
||||
* only hides the qr code button
|
||||
*
|
||||
*
|
||||
* @name TopNav.hideQrCodeButton
|
||||
* @function
|
||||
*/
|
||||
|
@ -4053,7 +4051,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
|
|||
|
||||
/**
|
||||
* hide all irrelevant buttons when viewing burn after reading paste
|
||||
*
|
||||
*
|
||||
* @name TopNav.hideBurnAfterReadingButtons
|
||||
* @function
|
||||
*/
|
||||
|
@ -4089,7 +4087,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
|
|||
|
||||
/**
|
||||
* hides the custom attachment
|
||||
*
|
||||
*
|
||||
* @name TopNav.hideCustomAttachment
|
||||
* @function
|
||||
*/
|
||||
|
@ -4112,6 +4110,19 @@ jQuery.PrivateBin = (function($, RawDeflate) {
|
|||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* Clear the attachment input in the top navigation.
|
||||
*
|
||||
* @name TopNav.clearAttachmentInput
|
||||
* @function
|
||||
*/
|
||||
me.clearAttachmentInput = function()
|
||||
{
|
||||
// hide UI for selected files
|
||||
// our up-to-date jQuery can handle it :)
|
||||
$fileWrap.find('input').val('');
|
||||
};
|
||||
|
||||
/**
|
||||
* returns the currently set expiration time
|
||||
*
|
||||
|
@ -4213,7 +4224,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
|
|||
|
||||
/**
|
||||
* Highlight file upload
|
||||
*
|
||||
*
|
||||
* @name TopNav.highlightFileupload
|
||||
* @function
|
||||
*/
|
||||
|
@ -4232,7 +4243,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
|
|||
|
||||
/**
|
||||
* set the format on bootstrap templates in dropdown programmatically
|
||||
*
|
||||
*
|
||||
* @name TopNav.setFormat
|
||||
* @function
|
||||
*/
|
||||
|
@ -4243,7 +4254,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
|
|||
|
||||
/**
|
||||
* returns if attachment dropdown is readonly, not editable
|
||||
*
|
||||
*
|
||||
* @name TopNav.isAttachmentReadonly
|
||||
* @function
|
||||
* @return {bool}
|
||||
|
@ -5133,6 +5144,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
|
|||
Editor.show();
|
||||
Editor.focusInput();
|
||||
AttachmentViewer.removeAttachment();
|
||||
TopNav.clearAttachmentInput();
|
||||
|
||||
TopNav.showCreateButtons();
|
||||
|
||||
|
|
Loading…
Reference in a new issue