From 16e3524bcab07f4f391cc32347d8732d734b1058 Mon Sep 17 00:00:00 2001
From: Derk-Jan Hartman <hartman.wiki@gmail.com>
Date: Mon, 8 Dec 2014 12:03:37 +0100
Subject: [PATCH] mediawiki.feedback: Improve error handling

Some loose ends with the rewrite to promises, add some logging in case
of errors, so it's a bit easier to figure out why something was failing

Bug: T51636
Change-Id: I081c58378566baef273b76c1a25c3b2d8ba0e19e
---
 resources/src/mediawiki/mediawiki.feedback.js | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/resources/src/mediawiki/mediawiki.feedback.js b/resources/src/mediawiki/mediawiki.feedback.js
index 6bcb87fdd6..587f5b960e 100644
--- a/resources/src/mediawiki/mediawiki.feedback.js
+++ b/resources/src/mediawiki/mediawiki.feedback.js
@@ -260,21 +260,22 @@
 				{ redirect: true }
 			)
 			.done( function ( result ) {
-				if ( result.edit !== undefined ) {
-					if ( result.edit.result === 'Success' ) {
-						fb.displayThanks();
-					} else {
-						// unknown API result
-						fb.displayError( 'feedback-error1' );
-					}
+				if ( result.edit.result === 'Success' ) {
+					fb.displayThanks();
 				} else {
-					// edit failed
-					fb.displayError( 'feedback-error2' );
+					// unknown API result
+					fb.displayError( 'feedback-error1' );
 				}
 			} )
-			.fail( function () {
-				// ajax request failed
-				fb.displayError( 'feedback-error3' );
+			.fail( function ( code, result ) {
+				if ( code === 'http' ) {
+					// ajax request failed
+					fb.displayError( 'feedback-error3' );
+					mw.log.warn( 'Feedback report failed with HTTP error: ' +  result.textStatus );
+				} else {
+					fb.displayError( 'feedback-error2' );
+					mw.log.warn( 'Feedback report failed with API error: ' +  code );
+				}
 			} );
 		},
 
-- 
2.20.1