Infra-Mirrors/PrivateBin
1
0
Fork 0
mirror of https://github.com/PrivateBin/PrivateBin.git synced 2025-07-21 14:08:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

expiration time selection for bootstrap template, fixes #1309

Browse source
This commit is contained in:
El RIDO 2024-05-09 15:55:42 +02:00
parent 08aa10a4b7
commit 2c8b5ed0e4
No known key found for this signature in database
GPG key ID: 0F5C940A6BD81F92
5 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/privatebin.js
View file

@ -4371,7 +4371,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
*/
me.getExpiration = function()
{
return Model.getExpirationDefault() || pasteExpiration;
return pasteExpiration;
};
/**
@ -4554,6 +4554,10 @@ jQuery.PrivateBin = (function($, RawDeflate) {
// bootstrap template drop downs
$('ul.dropdown-menu li a', $('#expiration').parent()).click(updateExpiration);
$('ul.dropdown-menu li a', $('#formatter').parent()).click(updateFormat);
// bootstrap5 & page drop downs
$('#pasteExpiration').on('change', function() {
pasteExpiration = Model.getExpirationDefault();
});
$('#pasteFormatter').on('change', function() {
PasteViewer.setFormat(Model.getFormatDefault());
});
@ -4565,7 +4569,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
// get default values from template or fall back to set value
burnAfterReadingDefault = me.getBurnAfterReading();
openDiscussionDefault = me.getOpenDiscussion();
pasteExpiration = Model.getExpirationDefault() || pasteExpiration;
pasteExpiration = Model.getExpirationDefault();
createButtonsDisplayed = false;
viewButtonsDisplayed = false;