mirror of
https://github.com/thelounge/thelounge
synced 2024-11-27 06:20:26 +00:00
Merge pull request #709 from thelounge/astorije/rm-notification-poyfill
Remove browser notification polyfill and inform user when unsupported
This commit is contained in:
Jérémie Astori
GitHub
commit
dba885be47
3 changed files with 45 additions and 243 deletions
|
|
@ -283,7 +283,14 @@
|
|||
<label class="opt">
|
||||
<input id="desktopNotifications" type="checkbox" name="desktopNotifications">
|
||||
Enable desktop notifications<br>
|
||||
<div class="error" id="warnDisabledDesktopNotifications"><strong>Warning</strong>: Desktop notifications are blocked by your web browser</div>
|
||||
<div class="error" id="warnUnsupportedDesktopNotifications">
|
||||
<strong>Warning</strong>:
|
||||
Desktop notifications are not supported by your browser.
|
||||
</div>
|
||||
<div class="error" id="warnBlockedDesktopNotifications">
|
||||
<strong>Warning</strong>:
|
||||
Desktop notifications are blocked by your browser.
|
||||
</div>
|
||||
</label>
|
||||
</div>
|
||||
<div class="col-sm-12">
|
||||
|
|
|
|||
|
|
@ -1,218 +0,0 @@
|
|||
/**
|
||||
* Notification JS
|
||||
* Shims up the Notification API
|
||||
*
|
||||
* @author Andrew Dodson
|
||||
* @website http://adodson.com/notification.js/
|
||||
*/
|
||||
|
||||
//
|
||||
// Does the browser support the the Notification API?
|
||||
// .. and does it have a permission property?
|
||||
//
|
||||
|
||||
(function(window, document){
|
||||
|
||||
var PERMISSION_GRANTED = 'granted',
|
||||
PERMISSION_DENIED = 'denied',
|
||||
PERMISSION_UNKNOWN = 'unknown';
|
||||
|
||||
var a = [], iv, i=0;
|
||||
|
||||
//
|
||||
// Swap the document.title with the notification
|
||||
//
|
||||
function swaptitle(title){
|
||||
|
||||
if(a.length===0){
|
||||
a = [document.title];
|
||||
}
|
||||
|
||||
a.push(title);
|
||||
|
||||
if(!iv){
|
||||
iv = setInterval(function(){
|
||||
|
||||
// has document.title changed externally?
|
||||
if(a.indexOf(document.title) === -1 ){
|
||||
// update the default title
|
||||
a[0] = document.title;
|
||||
}
|
||||
|
||||
document.title = a[++i%a.length];
|
||||
}, 1000);
|
||||
}
|
||||
}
|
||||
|
||||
function swapTitleCancel(){
|
||||
|
||||
// dont do any more if we haven't got anything open
|
||||
if(a.length===0){
|
||||
return;
|
||||
}
|
||||
|
||||
// if an IE overlay is present, kill it
|
||||
if("external" in window && "msSiteModeClearIconOverlay" in window.external ){
|
||||
window.external.msSiteModeClearIconOverlay();
|
||||
}
|
||||
|
||||
clearInterval(iv);
|
||||
|
||||
iv = false;
|
||||
document.title = a[0];
|
||||
a = [];
|
||||
}
|
||||
|
||||
//
|
||||
// Add aevent handlers
|
||||
function addEvent(el,name,func){
|
||||
if(name.match(" ")){
|
||||
var a = name.split(' ');
|
||||
for(var i=0;i<a.length;i++){
|
||||
addEvent( el, a[i], func);
|
||||
}
|
||||
}
|
||||
if(el.addEventListener){
|
||||
el.removeEventListener(name, func, false);
|
||||
el.addEventListener(name, func, false);
|
||||
}
|
||||
else {
|
||||
el.detachEvent('on'+name, func);
|
||||
el.attachEvent('on'+name, func);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function check_permission(){
|
||||
// Check whether the current desktop supports notifications and if they are authorised,
|
||||
// PERMISSION_GRANTED (yes they are supported and permission is granted),
|
||||
// PERMISSION_DENIED (yes they are supported, permission has not been granted),
|
||||
// -1 (Notifications are not supported)
|
||||
|
||||
// IE9
|
||||
if(("external" in window) && ("msIsSiteMode" in window.external)){
|
||||
return window.external.msIsSiteMode()? PERMISSION_GRANTED : PERMISSION_UNKNOWN;
|
||||
}
|
||||
else if("webkitNotifications" in window){
|
||||
return window.webkitNotifications.checkPermission() === 0 ? PERMISSION_GRANTED : PERMISSION_DENIED;
|
||||
}
|
||||
else if("mozNotification" in window.navigator){
|
||||
return PERMISSION_GRANTED;
|
||||
}
|
||||
else {
|
||||
return PERMISSION_UNKNOWN;
|
||||
}
|
||||
}
|
||||
|
||||
function update_permission(){
|
||||
// Define the current state
|
||||
window.Notification.permission = check_permission();
|
||||
return window.Notification.permission;
|
||||
}
|
||||
|
||||
|
||||
if(!Object(window.Notification).permission){
|
||||
|
||||
//
|
||||
// Bind event handlers to the body
|
||||
addEvent(window, "focus scroll click", swapTitleCancel);
|
||||
|
||||
// Assign it.
|
||||
window.Notification = function(message, options){
|
||||
|
||||
// ensure this is an instance
|
||||
if(!(this instanceof window.Notification)){
|
||||
return new window.Notification(message,options);
|
||||
}
|
||||
|
||||
var n, self = this;
|
||||
|
||||
//
|
||||
options = options || {};
|
||||
|
||||
this.body = options.body || '';
|
||||
this.icon = options.icon || '';
|
||||
this.lang = options.lang || '';
|
||||
this.tag = options.tag || '';
|
||||
this.close = function(){
|
||||
|
||||
// remove swapTitle
|
||||
swapTitleCancel();
|
||||
|
||||
// Close
|
||||
if(Object(n).close){
|
||||
n.close();
|
||||
}
|
||||
|
||||
self.onclose();
|
||||
};
|
||||
this.onclick = function(){};
|
||||
this.onclose = function(){};
|
||||
|
||||
//
|
||||
// Swap document.title
|
||||
//
|
||||
swaptitle(message);
|
||||
|
||||
//
|
||||
// Create Desktop Notifications
|
||||
//
|
||||
if(("external" in window) && ("msIsSiteMode" in window.external)){
|
||||
if(window.external.msIsSiteMode()){
|
||||
window.external.msSiteModeActivate();
|
||||
if(this.icon){
|
||||
window.external.msSiteModeSetIconOverlay(this.icon, message);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if("webkitNotifications" in window){
|
||||
if(window.webkitNotifications.checkPermission() === 0){
|
||||
n = window.webkitNotifications.createNotification(this.icon, message, this.body );
|
||||
n.show();
|
||||
n.onclick = function(){
|
||||
|
||||
// Fire any user bound events to the onclick function
|
||||
self.onclick();
|
||||
|
||||
// redirect the user back to the page
|
||||
window.focus();
|
||||
setTimeout( function(){ n.cancel(); }, 1000);
|
||||
};
|
||||
}
|
||||
}
|
||||
else if( "mozNotification" in window.navigator ){
|
||||
var m = window.navigator.mozNotification.createNotification( message, this.body, this.icon );
|
||||
m.show();
|
||||
}
|
||||
};
|
||||
|
||||
window.Notification.requestPermission = function(cb){
|
||||
// Setup
|
||||
// triggers the authentication to create a notification
|
||||
cb = cb || function(){};
|
||||
|
||||
// IE9
|
||||
if(("external" in window) && ("msIsSiteMode" in window.external)){
|
||||
try{
|
||||
if( !window.external.msIsSiteMode() ){
|
||||
window.external.msAddSiteMode();
|
||||
cb( PERMISSION_UNKNOWN );
|
||||
}
|
||||
}
|
||||
catch(e){}
|
||||
cb( update_permission() );
|
||||
}
|
||||
else if("webkitNotifications" in window){
|
||||
window.webkitNotifications.requestPermission(function(){
|
||||
cb( update_permission() );
|
||||
});
|
||||
}
|
||||
else {
|
||||
cb( update_permission() );
|
||||
}
|
||||
};
|
||||
|
||||
// Get the current permission
|
||||
update_permission();
|
||||
}
|
||||
})(window, document);
|
||||
|
|
@ -505,6 +505,8 @@ $(function() {
|
|||
userStyles: userStyles.text(),
|
||||
}, JSON.parse(window.localStorage.getItem("settings")));
|
||||
|
||||
var windows = $("#windows");
|
||||
|
||||
(function SettingsScope() {
|
||||
var settings = $("#settings");
|
||||
|
||||
|
|
@ -566,13 +568,43 @@ $(function() {
|
|||
.trigger("change");
|
||||
|
||||
$("#desktopNotifications").on("change", function() {
|
||||
var self = $(this);
|
||||
if (self.prop("checked")) {
|
||||
if (Notification.permission !== "granted") {
|
||||
if ($(this).prop("checked") && Notification.permission !== "granted") {
|
||||
Notification.requestPermission(updateDesktopNotificationStatus);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// 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);
|
||||
}
|
||||
}());
|
||||
|
||||
var viewport = $("#viewport");
|
||||
|
|
@ -1052,7 +1084,6 @@ $(function() {
|
|||
}
|
||||
});
|
||||
|
||||
var windows = $("#windows");
|
||||
var forms = $("#sign-in, #connect, #change-password");
|
||||
|
||||
windows.on("show", "#sign-in", function() {
|
||||
|
|
@ -1089,7 +1120,6 @@ $(function() {
|
|||
}
|
||||
});
|
||||
}
|
||||
windows.on("show", "#settings", updateDesktopNotificationStatus);
|
||||
|
||||
forms.on("submit", "form", function(e) {
|
||||
e.preventDefault();
|
||||
|
|
@ -1214,23 +1244,6 @@ $(function() {
|
|||
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() {
|
||||
sidebar.sortable({
|
||||
axis: "y",
|
||||
|
|
|
|||
Loading…
Reference in a new issue