web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix cornerPopup timeout not always applied

Browse Source
This commit is contained in:
yflory 2020-02-21 12:15:34 +01:00
parent d0bce11c21
commit 2cceb54aac
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/common/common-interface.js
View File

@ -1148,7 +1148,14 @@ define([
var deletePopup = function () { var deletePopup = function () {
$popup.remove(); $popup.remove();
if (!corner.queue.length) { if (!corner.queue.length) {
// Make sure no other popup is displayed in the next 5s
setTimeout(function () {
if (corner.queue.length) {
$('body').append(corner.queue.pop());
return;
}
corner.state = false; corner.state = false;
}, 5000);
return; return;
} }
setTimeout(function () { setTimeout(function () {

5
www/common/common-ui-elements.js
View File

@ -4306,6 +4306,9 @@ define([
var initialHide = data && data.autoStore && data.autoStore === -1; var initialHide = data && data.autoStore && data.autoStore === -1;
var modal = UI.cornerPopup(text, actions, footer, {hidden: initialHide}); var modal = UI.cornerPopup(text, actions, footer, {hidden: initialHide});
// Once the store pad popup is created, put the crowdfunding one in the queue
UIElements.displayCrowdfunding(common);
autoStoreModal[priv.channel] = modal; autoStoreModal[priv.channel] = modal;
$(modal.popup).find('.cp-corner-footer a').click(function (e) { $(modal.popup).find('.cp-corner-footer a').click(function (e) {
@ -4314,7 +4317,6 @@ define([
}); });
$(hide).click(function () { $(hide).click(function () {
UIElements.displayCrowdfunding(common);
delete autoStoreModal[priv.channel]; delete autoStoreModal[priv.channel];
modal.delete(); modal.delete();
}); });
@ -4334,7 +4336,6 @@ define([
$(document).trigger('cpPadStored'); $(document).trigger('cpPadStored');
delete autoStoreModal[priv.channel]; delete autoStoreModal[priv.channel];
modal.delete(); modal.delete();
UIElements.displayCrowdfunding(common);
UI.log(Messages.autostore_saved); UI.log(Messages.autostore_saved);
}); });
}); });