Etherpad-Plugins/ep_email_notifications
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

previous fix generate another bug -> fixed

Browse source
This commit is contained in:
quenenni 2013-04-06 22:55:21 +02:00
parent e79b95af3f
commit 750b0e3d18
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
static/js/ep_email.js
View file

@ -22,7 +22,6 @@ exports.postAceInit = function(hook, context){
$('#options-emailNotifications').on('click', function() { $('#options-emailNotifications').on('click', function() {
if (!optionsAlreadyRecovered) { if (!optionsAlreadyRecovered) {
getDataForUserId('ep_email_form_mysettings'); getDataForUserId('ep_email_form_mysettings');
optionsAlreadyRecovered = true;
} else { } else {
$('.ep_email_settings').slideToggle(); $('.ep_email_settings').slideToggle();
} }
@ -103,7 +102,7 @@ exports.handleClientMessage_emailNotificationGetUserInfo = function (hook, conte
var result = context.payload; var result = context.payload;
// Only use first data from the server. (case when 2 emails subscribed for the same pad & authorId) // Only use first data from the server. (case when 2 emails subscribed for the same pad & authorId)
if ($('.ep_email_settings').is(':visible') == false) { if (optionsAlreadyRecovered == false) {
if(result.success == true){ // If data found, set the options with them if(result.success == true){ // If data found, set the options with them
$('[name=ep_email]').val(result.email); $('[name=ep_email]').val(result.email);
$('[name=ep_email_onStart]').prop('checked', result.onStart); $('[name=ep_email_onStart]').prop('checked', result.onStart);
@ -116,6 +115,8 @@ exports.handleClientMessage_emailNotificationGetUserInfo = function (hook, conte
if (result.formName == 'ep_email_form_mysettings') { if (result.formName == 'ep_email_form_mysettings') {
$('.ep_email_settings').slideToggle(); $('.ep_email_settings').slideToggle();
} }
optionsAlreadyRecovered = true;
} }
} }
@ -183,8 +184,6 @@ function askClientToEnterEmail(){
text: "<p class='ep_email_form_popup_header'>" + window._('ep_email_notifications.headerGritterSubscr') + "</p>" + formContent, text: "<p class='ep_email_form_popup_header'>" + window._('ep_email_notifications.headerGritterSubscr') + "</p>" + formContent,
// (bool | optional) if you want it to fade out on its own or just sit there // (bool | optional) if you want it to fade out on its own or just sit there
sticky: true, sticky: true,
// (int | optional) the time you want it to be alive for before fading out
time: 2000,
// (string | optional) add a class name to the gritter msg // (string | optional) add a class name to the gritter msg
class_name: "emailNotificationsPopupForm", class_name: "emailNotificationsPopupForm",
// the function to bind to the form // the function to bind to the form
@ -206,8 +205,14 @@ function askClientToEnterEmail(){
checkAndSend(e); checkAndSend(e);
}); });
getDataForUserId('ep_email_form_popup'); if (optionsAlreadyRecovered == false) {
optionsAlreadyRecovered = true; getDataForUserId('ep_email_form_popup');
} else {
// Get datas from form in mysettings menu
$('#ep_email_form_popup [name=ep_email]').val($('#ep_email_form_mysettings [name=ep_email]').val());
$('#ep_email_form_popup [name=ep_email_onStart]').prop('checked', $('#ep_email_form_mysettings [name=ep_email_onStart]').prop('checked'));
$('#ep_email_form_popup [name=ep_email_onEnd]').prop('checked', $('#ep_email_form_mysettings [name=ep_email_onEnd]').prop('checked'));
}
} }
}); });
} }