Catch json parsing errors.

owljsorg · Jun 9, 2017 · 7d0489a · 7d0489a
1 parent 693efae
commit 7d0489a
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 7 deletions.
diff --git a/dist/owl-amd.min.js b/dist/owl-amd.min.js
diff --git a/dist/owl-commonjs-ajax.js b/dist/owl-commonjs-ajax.js
@@ -47,7 +47,12 @@ var owl = {
                         error;
                     if (xhr.readyState === 4) {
                         if (xhr.status >= 200 && xhr.status < 300) {
-                            response = JSON.parse(xhr.responseText);
+                            try {
+                                response = JSON.parse(xhr.responseText);
+                            } catch (err) {
+                                reject(err);
+                                return;
+                            }
                             settings.success && settings.success(response);
                             resolve(response);
                         } else {

diff --git a/dist/owl-commonjs-core.js b/dist/owl-commonjs-core.js
@@ -968,7 +968,12 @@ var owl = {
                         error;
                     if (xhr.readyState === 4) {
                         if (xhr.status >= 200 && xhr.status < 300) {
-                            response = JSON.parse(xhr.responseText);
+                            try {
+                                response = JSON.parse(xhr.responseText);
+                            } catch (err) {
+                                reject(err);
+                                return;
+                            }
                             settings.success && settings.success(response);
                             resolve(response);
                         } else {

diff --git a/dist/owl-commonjs.js b/dist/owl-commonjs.js
@@ -968,7 +968,12 @@ var owl = {
                         error;
                     if (xhr.readyState === 4) {
                         if (xhr.status >= 200 && xhr.status < 300) {
-                            response = JSON.parse(xhr.responseText);
+                            try {
+                                response = JSON.parse(xhr.responseText);
+                            } catch (err) {
+                                reject(err);
+                                return;
+                            }
                             settings.success && settings.success(response);
                             resolve(response);
                         } else {

diff --git a/dist/owl.min.js b/dist/owl.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "owljs",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "Backbone-like frontend library",
   "main": "index.js",
   "directories": {

diff --git a/src/owl.ajax.js b/src/owl.ajax.js
@@ -36,7 +36,12 @@
                         error;
                     if (xhr.readyState === 4) {
                         if (xhr.status >= 200 && xhr.status < 300) {
-                            response = JSON.parse(xhr.responseText);
+                            try {
+                                response = JSON.parse(xhr.responseText);
+                            } catch (err) {
+                                reject(err);
+                                return;
+                            }
                             settings.success && settings.success(response);
                             resolve(response);
                         } else {

diff --git a/test/owl.ajax.js b/test/owl.ajax.js
@@ -21,6 +21,11 @@ describe('owl.ajax', function() {
         { 'Content-Type': 'application/json' },
         '{}'
     ]);
+    server.respondWith('GET', '/something-wrong', [
+        200,
+        { 'Content-Type': 'application/json' },
+        '{somethingInvalid:'
+    ]);
 
     describe('request', function() {
         it('should make GET by default', function(done) {
@@ -111,6 +116,20 @@ describe('owl.ajax', function() {
         });
     });
 
+    describe('request (invalid)', function() {
+        it('should catch error', function(done) {
+            owl.ajax.request({
+                url: '/something-wrong',
+                type: 'GET'
+            }).catch(function(error) {
+                done();
+                owl.ajax.restore();
+            });
+
+            server.respond();
+        });
+    });
+
     describe('toJsonString', function() {
         it('stringify object', function() {
             expect(owl.ajax.toJsonString({