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

Merge pull request #28 from lpoujol/desktopNotificationSetting

Browse Source 
Remove "badge" setting and rely on browser choice for desktop notifcations
This commit is contained in:
Jérémie Astori 2016-03-06 14:45:52 -05:00
commit c4d628db49
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/css/style.css
View File

@ -1128,6 +1128,11 @@ button,
color: #2ecc40; color: #2ecc40;
} }
#settings .error {
color: #e74c3c;
margin-top: .2em;
}
#form { #form {
background: #eee; background: #eee;
border-top: 1px solid #ddd; border-top: 1px solid #ddd;

5
client/index.html
View File

@ -243,8 +243,9 @@
</div> </div>
<div class="col-sm-12"> <div class="col-sm-12">
<label class="opt"> <label class="opt">
<input id="badge" type="checkbox" name="badge"> <input id="desktopNotifications" type="checkbox" name="desktopNotifications">
Enable badge Enable desktop notifications<br>
<div class="error" id="warnDisabledDesktopNotifications"><strong>Warning</strong>: Desktop notifications are blocked by your web browser</div>
</label> </label>
</div> </div>
<div class="col-sm-12"> <div class="col-sm-12">

27
client/js/lounge.js
View File

@ -407,7 +407,7 @@ $(function() {
var userStyles = $("#user-specified-css"); var userStyles = $("#user-specified-css");
var settings = $("#settings"); var settings = $("#settings");
var options = $.extend({ var options = $.extend({
badge: false, desktopNotifications: false,
colors: false, colors: false,
join: true, join: true,
links: true, links: true,
@ -467,11 +467,11 @@ $(function() {
}).find("input") }).find("input")
.trigger("change"); .trigger("change");
$("#badge").on("change", function() { $("#desktopNotifications").on("change", function() {
var self = $(this); var self = $(this);
if (self.prop("checked")) { if (self.prop("checked")) {
if (Notification.permission !== "granted") { if (Notification.permission !== "granted") {
Notification.requestPermission(); Notification.requestPermission(updateDesktopNotificationStatus);
} }
} }
}); });
@ -757,7 +757,7 @@ $(function() {
} }
toggleFaviconNotification(true); toggleFaviconNotification(true);
if (options.badge && Notification.permission === "granted") { if (options.desktopNotifications && Notification.permission === "granted") {
var title; var title;
var body; var body;
@ -860,6 +860,8 @@ $(function() {
}); });
}); });
windows.on("show", "#settings", updateDesktopNotificationStatus);
forms.on("submit", "form", function(e) { forms.on("submit", "form", function(e) {
e.preventDefault(); e.preventDefault();
var event = "auth"; var event = "auth";
@ -992,6 +994,23 @@ $(function() {
location.reload(); location.reload();
} }
function updateDesktopNotificationStatus(){
var checkbox = $("#desktopNotifications");
var warning = $("#warnDisabledDesktopNotifications");
if (Notification.permission === "denied"){
checkbox.attr("disabled", true);
checkbox.attr("checked", false);
warning.show();
} else {
if (Notification.permission === "default" && checkbox.prop("checked")){
checkbox.attr("checked", false);
}
checkbox.attr("disabled", false);
warning.hide();
}
}
function sortable() { function sortable() {
sidebar.sortable({ sidebar.sortable({
axis: "y", axis: "y",