wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-23 23:57:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

moebius#154: Notifications - user settings - the immediate duration of the alert

Browse source 
https://github.com/MoonchildProductions/moebius/pull/154
This commit is contained in:
janekptacijarabaci 2018-04-12 20:23:00 +02:00 • committed by Roy Tam
commit b6d461c817
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/libpref/init/all.js
View file

@ -4746,6 +4746,8 @@ pref("dom.webnotifications.requireinteraction.enabled", false);
// Alert animation effect, name is disableSlidingEffect for backwards-compat. // Alert animation effect, name is disableSlidingEffect for backwards-compat.
pref("alerts.disableSlidingEffect", false); pref("alerts.disableSlidingEffect", false);
// The immediate duration of the alert, in milliseconds.
pref("alerts.durationImmediate", 20000);
// Show favicons in web notifications. // Show favicons in web notifications.
pref("alerts.showFavicons", false); pref("alerts.showFavicons", false);

1
toolkit/components/alerts/resources/content/alert.css
View file

@ -3,7 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#alertBox[animate] { #alertBox[animate] {
animation-duration: 20s;
animation-fill-mode: both; animation-fill-mode: both;
animation-name: alert-animation; animation-name: alert-animation;
} }

10
toolkit/components/alerts/resources/content/alert.js
View file

@ -166,7 +166,12 @@ function prefillAlertInfo() {
} }
function onAlertLoad() { function onAlertLoad() {
const ALERT_DURATION_IMMEDIATE = 20000; const ALERT_DURATION_IMMEDIATE_MIN = 4000;
const ALERT_DURATION_IMMEDIATE_MAX = 60000;
let alertDurationImmediate = Services.prefs.getIntPref("alerts.durationImmediate", ALERT_DURATION_IMMEDIATE_MIN);
alertDurationImmediate = alertDurationImmediate >= ALERT_DURATION_IMMEDIATE_MIN
&& alertDurationImmediate <= ALERT_DURATION_IMMEDIATE_MAX
? alertDurationImmediate : ALERT_DURATION_IMMEDIATE_MIN;
let alertTextBox = document.getElementById("alertTextBox"); let alertTextBox = document.getElementById("alertTextBox");
let alertImageBox = document.getElementById("alertImageBox"); let alertImageBox = document.getElementById("alertImageBox");
alertImageBox.style.minHeight = alertTextBox.scrollHeight + "px"; alertImageBox.style.minHeight = alertTextBox.scrollHeight + "px";
@ -186,7 +191,7 @@ function onAlertLoad() {
// If the require interaction flag is set, prevent auto-closing the notification. // If the require interaction flag is set, prevent auto-closing the notification.
if (!gRequireInteraction) { if (!gRequireInteraction) {
if (Services.prefs.getBoolPref("alerts.disableSlidingEffect")) { if (Services.prefs.getBoolPref("alerts.disableSlidingEffect")) {
setTimeout(function() { window.close(); }, ALERT_DURATION_IMMEDIATE); setTimeout(function() { window.close(); }, alertDurationImmediate);
} else { } else {
let alertBox = document.getElementById("alertBox"); let alertBox = document.getElementById("alertBox");
alertBox.addEventListener("animationend", function hideAlert(event) { alertBox.addEventListener("animationend", function hideAlert(event) {
@ -197,6 +202,7 @@ function onAlertLoad() {
window.close(); window.close();
} }
}, false); }, false);
alertBox.style.animationDuration = Math.round(alertDurationImmediate / 1000).toString() + "s";
alertBox.setAttribute("animate", true); alertBox.setAttribute("animate", true);
} }
} }