Cleanup notifications class

Fix #71
master
Daniel Berteaud 11 years ago
parent d43d387b8c
commit d58bb6738e
  1. 26
      public/js/vroom.js

@ -130,7 +130,7 @@ function removeNotifiedEmail(email){
}, },
success: function(data) { success: function(data) {
if (data.status == 'success'){ if (data.status == 'success'){
$.notify(data.msg, 'success'); $.notify(data.msg, 'info');
$('#emailNotification_' + id).remove(); $('#emailNotification_' + id).remove();
webrtc.sendToAll('notif_change', {}); webrtc.sendToAll('notif_change', {});
} }
@ -1201,12 +1201,12 @@ function initVroom(room) {
if (peers.local.role == 'owner'){ if (peers.local.role == 'owner'){
var who = (peers[data.id].hasName) ? peers[data.id].displayName : locale.A_ROOM_ADMIN; var who = (peers[data.id].hasName) ? peers[data.id].displayName : locale.A_ROOM_ADMIN;
if (data.payload.action == 'set'){ if (data.payload.action == 'set'){
$.notify(sprintf(locale.OWNER_PASSWORD_CHANGED_BY_s, stringEscape(who)), 'warn'); $.notify(sprintf(locale.OWNER_PASSWORD_CHANGED_BY_s, stringEscape(who)), 'info');
$('#persistentLabel').addClass('btn-danger active'); $('#persistentLabel').addClass('btn-danger active');
$('#persistentButton').prop('checked', true); $('#persistentButton').prop('checked', true);
} }
else{ else{
$.notify(sprintf(locale.OWNER_PASSWORD_REMOVED_BY_s, stringEscape(who)), 'warn'); $.notify(sprintf(locale.OWNER_PASSWORD_REMOVED_BY_s, stringEscape(who)), 'info');
$('#persistentLabel').removeClass('btn-danger active'); $('#persistentLabel').removeClass('btn-danger active');
$('#persistentButton').prop('checked', false); $('#persistentButton').prop('checked', false);
} }
@ -1244,7 +1244,7 @@ function initVroom(room) {
}); });
} }
var who = (peers[data.id].hasName) ? peers[data.id].displayName : locale.A_ROOM_ADMIN; var who = (peers[data.id].hasName) ? peers[data.id].displayName : locale.A_ROOM_ADMIN;
$.notify(sprintf(locale.ROOM_DATA_WIPED_BY_s, stringEscape(who)), 'warn'); $.notify(sprintf(locale.ROOM_DATA_WIPED_BY_s, stringEscape(who)), 'info');
}); });
// Handle the readyToCall event: join the room // Handle the readyToCall event: join the room
@ -1499,7 +1499,7 @@ function initVroom(room) {
}, },
success: function(data) { success: function(data) {
if (data.status == 'success'){ if (data.status == 'success'){
$.notify(data.msg, 'success'); $.notify(data.msg, 'info');
if (type === 'set'){ if (type === 'set'){
$('#askForNameLabel').addClass('btn-danger active'); $('#askForNameLabel').addClass('btn-danger active');
} }
@ -1554,7 +1554,7 @@ function initVroom(room) {
else{ else{
$("#shareScreenLabel").addClass('btn-danger'); $("#shareScreenLabel").addClass('btn-danger');
peers.local.screenShared = true; peers.local.screenShared = true;
$.notify(locale.EVERYONE_CAN_SEE_YOUR_SCREEN, 'warn'); $.notify(locale.EVERYONE_CAN_SEE_YOUR_SCREEN, 'info');
} }
}); });
} }
@ -1562,7 +1562,7 @@ function initVroom(room) {
peers.local.screenShared = false; peers.local.screenShared = false;
webrtc.stopScreenShare(); webrtc.stopScreenShare();
$('#shareScreenLabel').removeClass('btn-danger'); $('#shareScreenLabel').removeClass('btn-danger');
$.notify(locale.SCREEN_UNSHARED, 'success'); $.notify(locale.SCREEN_UNSHARED, 'info');
} }
}); });
@ -1708,7 +1708,7 @@ function initVroom(room) {
$('#joinPass').val(''); $('#joinPass').val('');
$('#joinPassConfirm').val(''); $('#joinPassConfirm').val('');
if (data.status == 'success'){ if (data.status == 'success'){
$.notify(data.msg, 'success'); $.notify(data.msg, 'info');
$('#joinPassLabel').removeClass('btn-danger active'); $('#joinPassLabel').removeClass('btn-danger active');
webrtc.sendToAll('password_protect', {action: 'unset'}); webrtc.sendToAll('password_protect', {action: 'unset'});
} }
@ -1741,7 +1741,7 @@ function initVroom(room) {
$('#joinPass').val(''); $('#joinPass').val('');
$('#joinPassConfirm').val(''); $('#joinPassConfirm').val('');
if (data.status == 'success'){ if (data.status == 'success'){
$.notify(data.msg, 'success'); $.notify(data.msg, 'info');
$('#joinPassModal').modal('hide'); $('#joinPassModal').modal('hide');
$('#joinPassLabel').addClass('btn-danger active'); $('#joinPassLabel').addClass('btn-danger active');
$('#joinPassButton').prop('checked', true); $('#joinPassButton').prop('checked', true);
@ -1781,7 +1781,7 @@ function initVroom(room) {
success: function(data) { success: function(data) {
$('#ownerPass').val(''); $('#ownerPass').val('');
if (data.status == 'success'){ if (data.status == 'success'){
$.notify(data.msg, 'warn'); $.notify(data.msg, 'info');
webrtc.sendToAll('owner_password', {action: 'remove'}); webrtc.sendToAll('owner_password', {action: 'remove'});
$('#persistentLabel').removeClass('btn-danger active'); $('#persistentLabel').removeClass('btn-danger active');
} }
@ -1830,7 +1830,7 @@ function initVroom(room) {
$('#persistentModal').modal('hide'); $('#persistentModal').modal('hide');
$('#persistentLabel').addClass('btn-danger active'); $('#persistentLabel').addClass('btn-danger active');
$('#persistentButton').prop('checked', true); $('#persistentButton').prop('checked', true);
$.notify(data.msg, 'success'); $.notify(data.msg, 'info');
webrtc.sendToAll('owner_password', {action: 'set'}); webrtc.sendToAll('owner_password', {action: 'set'});
} }
else{ else{
@ -1869,7 +1869,7 @@ function initVroom(room) {
}, },
success: function(data) { success: function(data) {
if (data.status == 'success'){ if (data.status == 'success'){
$.notify(data.msg, 'success'); $.notify(data.msg, 'info');
addNotifiedEmail($('#newEmailNotification').val()); addNotifiedEmail($('#newEmailNotification').val());
webrtc.sendToAll('notif_change', {}); webrtc.sendToAll('notif_change', {});
$('#newEmailNotification').val(''); $('#newEmailNotification').val('');
@ -2017,7 +2017,7 @@ function initVroom(room) {
webrtc.sendToAll('wipe_data', {}); webrtc.sendToAll('wipe_data', {});
wipeChatHistory(); wipeChatHistory();
$('#wipeModal').modal('hide'); $('#wipeModal').modal('hide');
$.notify(locale.DATA_WIPED, 'success'); $.notify(locale.DATA_WIPED, 'info');
}); });
if (etherpad.enabled){ if (etherpad.enabled){

Loading…
Cancel
Save