* Fixed: misspled false

* Fixed: feedback form
* Fixed: Some localization strings
* Removed: deprecated function
* New: Option to input emails when resend email
* Added: explain message on email log filter

git-svn-id: https://plugins.svn.wordpress.org/post-smtp/trunk@1771856 b8457f37-d9ea-0310-8a92-e5e31aec5664

2 files changed, 81 insertions, 35 deletions

diff --git a/script/feedback/feedback.js b/script/feedback/feedback.js
index 97940cf..a151f3b 100644
--- a/script/feedback/feedback.js
+++ b/script/feedback/feedback.js
@@ -13,24 +13,17 @@ jQuery(document).ready(function($) {
 	      	minWidth: 400,
 	      	minHeight: 300,
 	      	modal: true,
-	      	buttons: {
-	      		'skip' : {
-		        	text: 'Skip',
-		        	id: 'postman-feedback-dialog-skip',
-		        	click: function() {
-		          		$( this ).dialog( "close" );
-
-		          		location.href = deactivateLink;
-		        	}				      			
-	      		},	      		
+	      	buttons: {      		
 	      		'go' : {
 		        	text: 'Continue',
+        			icons: { primary: "dashicons dashicons-update" },        	
 		        	id: 'postman-feedback-dialog-go',
 					class: 'button',
 		        	click: function() {
-		          		$( this ).dialog( "close" );
 
-		          		var form = $( this ).find( 'form' ).serializeArray(),
+		        		var dialog = $(this),
+		        			go = $('#postman-feedback-dialog-go'),
+		          			form = dialog.find( 'form' ).serializeArray(),
 							result = {};
 
 						$.each( form, function() {
@@ -41,13 +34,26 @@ jQuery(document).ready(function($) {
 						if ( ! jQuery.isEmptyObject( result ) ) {
 							result.action = 'post_user_feedback';
 
-							$.post( post_feedback.admin_ajax, result, function(result) {
-
-							});
+						    $.ajax({
+						        url: post_feedback.admin_ajax,
+						        type: 'POST',
+						        data: result,
+						        error: function(){},
+						        success: function(msg){},
+						        beforeSend: function() { 
+						        	go.addClass('postman-ajax-progress'); 
+						        },
+						        complete: function() { 
+						        	go.removeClass('postman-ajax-progress'); 
+			        	
+						        	dialog.dialog( "close" );
+						            location.href = deactivateLink;						        	
+						        }						        
+						    });		
+	
 						}
 
-		          		// Remove this comment to deactivate plugin
-		          		location.href = deactivateLink;
+
 		        	},				      			
 	      		},
 	      		'cancel' : {
@@ -57,7 +63,16 @@ jQuery(document).ready(function($) {
 		        	click: function() {
 		          		$( this ).dialog( "close" );
 		        	}				      			
-	      		}
+	      		},
+	      		'skip' : {
+		        	text: 'Skip',
+		        	id: 'postman-feedback-dialog-skip',
+		        	click: function() {
+		          		$( this ).dialog( "close" );
+
+		          		location.href = deactivateLink;
+		        	}				      			
+	      		},		      		
 	      	}
 	    });
 
@@ -65,8 +80,13 @@ jQuery(document).ready(function($) {
 			$( '.postman-reason-input' ).hide();
 
 			if ( $( this ).hasClass( 'postman-custom-input' ) ) {
-				$( this ).find( '.postman-reason-input' ).show();
+				$( '#postman-deactivate-reasons' ).next( '.postman-reason-input' ).show();
 			}
+
+			if ( $( this ).hasClass( 'postman-support-input' ) ) {
+				console.log($(this));
+				$( this ).find( '.postman-reason-input' ).show();
+			}			
 		});
 				    
 	});
diff --git a/script/postman_resend_email_sript.js b/script/postman_resend_email_sript.js
index 1905bc5..c6d218a 100644
--- a/script/postman_resend_email_sript.js
+++ b/script/postman_resend_email_sript.js
@@ -1,17 +1,43 @@
-function postman_resend_email(emailId) {
-	var data = {
-		'action' : 'postman_resend_mail',
-		'email' : emailId
-	};
-
-	jQuery.post(ajaxurl, data, function(response) {
-		if (response.success) {
-			alert(response.data.message);
-//			jQuery('span#resend-' + emailId).text(postman_js_resend_label);
-		} else {
-			alert(sprintf(postman_js_email_not_resent, response.data.message));
-		}
-	}).fail(function(response) {
-		ajaxFailed(response);
+jQuery(document).ready(function($) {
+	$('.postman-open-resend').on('click', function(e) {
+		e.preventDefault();
+
+		$(this).parent().next('div').fadeToggle();
 	});
-}
+
+	$('.postman-resend').on('click', function(e) {
+		e.preventDefault();
+
+		var parent = $(this).closest('div'),
+			mailField = $(this).prev('input'),
+			emailId = mailField.data('id'),
+			mail_to = mailField.val(),
+			security = parent.find('input[name="security"]').val();
+
+
+		postman_resend_email(emailId, mail_to, security);
+
+	});
+
+	function postman_resend_email(emailId, mail_to, security ) {
+		var data = {
+			'action' : 'postman_resend_mail',
+			'email' : emailId,
+			'mail_to' : mail_to,
+			'security' : security
+		};
+
+		jQuery.post(ajaxurl, data, function(response) {
+			if (response.success) {
+				alert(response.data.message);
+	//			jQuery('span#resend-' + emailId).text(postman_js_resend_label);
+			} else {
+				alert(sprintf(postman_js_email_not_resent, response.data.message));
+			}
+		}).fail(function(response) {
+			ajaxFailed(response);
+		});
+	}
+
+})
+