|
|
@@ -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;
|