diff options
| author | azul <azul@riseup.net> | 2018-01-31 01:29:35 -0800 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2018-01-31 01:29:35 -0800 |
| commit | a6e0378669118feeb0c42b6282b0b469fb11ad8f (patch) | |
| tree | 1b0b2e4bf32f3ebe8bd470c028d23db5ef0eecb0 /app/assets/javascripts/srp/src/jqueryRest.js | |
| parent | b7e9652ac8d3a817465acde31f866f961e050666 (diff) | |
| parent | 44f7e6f800dc1f6f2fc29e713bc49e1255856b2e (diff) | |
Merge branch 'upgrade/srp_js' into 'master'
Upgrade/srp js
See merge request leap/webapp!60
Diffstat (limited to 'app/assets/javascripts/srp/src/jqueryRest.js')
| -rw-r--r-- | app/assets/javascripts/srp/src/jqueryRest.js | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/app/assets/javascripts/srp/src/jqueryRest.js b/app/assets/javascripts/srp/src/jqueryRest.js index 437bd65..0c58eb2 100644 --- a/app/assets/javascripts/srp/src/jqueryRest.js +++ b/app/assets/javascripts/srp/src/jqueryRest.js @@ -88,17 +88,10 @@ srp.remote = (function(){ // the http error response. function error(xhr, text, thrown) { - 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); + if (xhr.responseText && xhr.responseText != "") + srp.error($.parseJSON(xhr.responseText)); + else + srp.error("Server did not respond."); }; return { |