Merge pull request #10 from Vadimator/master

fixed ajax promise
samsonos · Aug 26, 2016 · 9a72019 · 9a72019
2 parents dd098ce + 2a623d5
commit 9a72019
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/ajax.js b/ajax.js
@@ -22,17 +22,19 @@ SamsonJS.extend({
 
             xhr.onload = function () {
                 if (this.status == 200) {
+                    var response = this.response;
+
                     // Convert response to JSON object
                     try {
-                        var response = JSON.parse(this.response);
-
-                        if (response && response.status !== 0) {
-                            resolve(response);
-                        } else { // Call reject with response object
-                            throw new Error(response);
-                        }
+                        response = JSON.parse(response);
                     } catch (e) {
-                        throw new Error('JSON response parsing:' + e);
+                        throw 'JSON response parsing:' + e.toString();
+                    }
+
+                    if (response && response.status !== 0) {
+                        resolve(response);
+                    } else { // Call reject with response object
+                        reject(response);
                     }
                 } else {
                     var error = new Error(this.statusText);