diff options
| author | azul <azul@riseup.net> | 2017-03-23 15:44:06 +0000 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2017-03-23 15:44:06 +0000 |
| commit | 9beeee8aa2d1656e7c80e54137156e7922737aa5 (patch) | |
| tree | aa72458db14d1afbf06c89e40f4c28c6477015c4 /app/assets/javascripts/srp/src | |
| parent | ca92c307d0c02ee56d3ff22661511d8386d1af8f (diff) | |
| parent | c11e31acf3a592b8560459469ae4acf0e6e5dfd4 (diff) | |
Merge branch 'fix/display-js-error-responses' into 'master'
fix: display error js responses in dev environment
See merge request !30
github issue #231
Diffstat (limited to 'app/assets/javascripts/srp/src')
| -rw-r--r-- | app/assets/javascripts/srp/src/jqueryRest.js | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/app/assets/javascripts/srp/src/jqueryRest.js b/app/assets/javascripts/srp/src/jqueryRest.js index 0c58eb2..437bd65 100644 --- a/app/assets/javascripts/srp/src/jqueryRest.js +++ b/app/assets/javascripts/srp/src/jqueryRest.js @@ -88,10 +88,17 @@ srp.remote = (function(){ // the http error response. function error(xhr, text, thrown) { - if (xhr.responseText && xhr.responseText != "") - srp.error($.parseJSON(xhr.responseText)); - else - srp.error("Server did not respond."); + var message; + if (xhr.responseText && xhr.responseText != "") { + try { + message = $.parseJSON(xhr.responseText); + } catch (err) { + message = xhr.responseText; + } + } else { + message = "Server did not respond."; + } + srp.error(message); }; return { |