Merge pull request sendinblue#2 from sendinblue/feature_ImprovementTasks

Feature improvement tasks
commonknowledge · Jul 29, 2019 · 463c155 · 463c155
2 parents 81a43b3 + 6714f71
commit 463c155
Show file tree

Hide file tree

Showing 9 changed files with 286 additions and 208 deletions.
diff --git a/mailin/js/mailin-front.js b/mailin/js/mailin-front.js
@@ -158,9 +158,7 @@ jQuery(document).ready(function(){
                     {
                         jQuery('.sib-multi-lists').removeClass('sib_error');
                     }
-                    if (data.redirect) {
-                        window.location.href = data.redirect;
-                    } else if (data.status === 'success' || data.status === 'update') {
+                    if (data.status === 'success' || data.status === 'update') {
                         var cdata = '<p class="sib-alert-message sib-alert-message-success ">' + data.msg.successMsg + '</p>';
                         form.find('.sib_msg_disp').html(cdata).show();
                     } else if (data.status === 'failure') {
@@ -180,6 +178,9 @@ jQuery(document).ready(function(){
                         form.find('.sib_msg_disp').html(cdata).show();
                     }
                     form[0].reset();
+                    if (data.redirect && (data.status === 'success' || data.status === 'update')) {                        
+                        window.location.href = data.redirect;
+                    }
                     var previous_code = form.find('.sib-cflags').data('dial-code');
                     if ( previous_code )
                     {

diff --git a/mailin/lang/sib_lang-fr_FR.mo b/mailin/lang/sib_lang-fr_FR.mo