supernets/hardlounge
supernets/hardlounge
4
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1804 from thelounge/xpaw/no-use-before-define

Browse Source 
Enable no-use-before-define rule
This commit is contained in:
Jérémie Astori 2017-12-06 09:08:38 -05:00 committed by GitHub
commit 3df1e9d731
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintrc.yml
View File

@ -43,6 +43,7 @@ rules:
no-unsafe-negation: error no-unsafe-negation: error
no-useless-computed-key: error no-useless-computed-key: error
no-useless-return: error no-useless-return: error
no-use-before-define: [error, {functions: false}]
object-curly-spacing: [error, never] object-curly-spacing: [error, never]
padded-blocks: [error, never] padded-blocks: [error, never]
prefer-const: error prefer-const: error

86
client/js/options.js
View File

@ -68,6 +68,39 @@ module.exports.initialize = () => {
} }
} }
const desktopNotificationsCheckbox = $("#desktopNotifications");
const warningUnsupported = $("#warnUnsupportedDesktopNotifications");
const warningBlocked = $("#warnBlockedDesktopNotifications").hide();
// Updates the checkbox and warning in settings when the Settings page is
// opened or when the checkbox state is changed.
// When notifications are not supported, this is never called (because
// checkbox state can not be changed).
const updateDesktopNotificationStatus = function() {
if (Notification.permission === "denied") {
desktopNotificationsCheckbox.attr("disabled", true);
desktopNotificationsCheckbox.attr("checked", false);
warningBlocked.show();
} else {
if (Notification.permission === "default" && desktopNotificationsCheckbox.prop("checked")) {
desktopNotificationsCheckbox.attr("checked", false);
}
desktopNotificationsCheckbox.attr("disabled", false);
warningBlocked.hide();
}
};
// If browser does not support notifications, override existing settings and
// display proper message in settings.
if (("Notification" in window)) {
warningUnsupported.hide();
windows.on("show", "#settings", updateDesktopNotificationStatus);
} else {
options.desktopNotifications = false;
desktopNotificationsCheckbox.attr("disabled", true);
desktopNotificationsCheckbox.attr("checked", false);
}
settings.on("change", "input, select, textarea", function() { settings.on("change", "input, select, textarea", function() {
const self = $(this); const self = $(this);
const type = self.attr("type"); const type = self.attr("type");
@ -127,56 +160,11 @@ module.exports.initialize = () => {
} else { } else {
$("#input").textcomplete("destroy"); $("#input").textcomplete("destroy");
} }
} else if (name === "desktopNotifications") {
if ($(this).prop("checked") && Notification.permission !== "granted") {
Notification.requestPermission(updateDesktopNotificationStatus);
}
} }
}).find("input") }).find("input")
.trigger("change"); .trigger("change");
$("#desktopNotifications").on("change", function() {
if ($(this).prop("checked")) {
requestPermissionIfNeeded();
}
});
var requestPermissionIfNeeded = function() {
if (Notification.permission !== "granted") {
Notification.requestPermission(updateDesktopNotificationStatus);
}
};
if (options.desktopNotifications) {
requestPermissionIfNeeded();
}
// Updates the checkbox and warning in settings when the Settings page is
// opened or when the checkbox state is changed.
// When notifications are not supported, this is never called (because
// checkbox state can not be changed).
var updateDesktopNotificationStatus = function() {
if (Notification.permission === "denied") {
desktopNotificationsCheckbox.attr("disabled", true);
desktopNotificationsCheckbox.attr("checked", false);
warningBlocked.show();
} else {
if (Notification.permission === "default" && desktopNotificationsCheckbox.prop("checked")) {
desktopNotificationsCheckbox.attr("checked", false);
}
desktopNotificationsCheckbox.attr("disabled", false);
warningBlocked.hide();
}
};
// If browser does not support notifications, override existing settings and
// display proper message in settings.
var desktopNotificationsCheckbox = $("#desktopNotifications");
var warningUnsupported = $("#warnUnsupportedDesktopNotifications");
var warningBlocked = $("#warnBlockedDesktopNotifications");
warningBlocked.hide();
if (("Notification" in window)) {
warningUnsupported.hide();
windows.on("show", "#settings", updateDesktopNotificationStatus);
} else {
options.desktopNotifications = false;
desktopNotificationsCheckbox.attr("disabled", true);
desktopNotificationsCheckbox.attr("checked", false);
}
}; };