diff options
Diffstat (limited to 'public/assets/js')
| -rw-r--r-- | public/assets/js/lib/views/details/index.js | 2 | ||||
| -rw-r--r-- | public/assets/js/vendor/view/formview.js | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/public/assets/js/lib/views/details/index.js b/public/assets/js/lib/views/details/index.js index 871ac62..b10e5cc 100644 --- a/public/assets/js/lib/views/details/index.js +++ b/public/assets/js/lib/views/details/index.js @@ -29,7 +29,7 @@ var DetailsView = View.extend({ populate: function(data){ this.data = data console.log(data) - set_background_color(data.thread.color || data.keyword.color) + set_background_color(data.thread.color || (data.keyword ? data.keyword.color : 'plain')) $("body").removeClass('loading') var thread = data.thread $("h1").html(sanitize(thread.title)) diff --git a/public/assets/js/vendor/view/formview.js b/public/assets/js/vendor/view/formview.js index 1f681cb..6b03849 100644 --- a/public/assets/js/vendor/view/formview.js +++ b/public/assets/js/vendor/view/formview.js @@ -100,11 +100,14 @@ var FormView = View.extend({ dataType: "json", processData: false, success: function(response){ - console.log(response) if (response.error) { var errors = [] - for (var key in response.error.errors) { - errors.push(response.error.errors[key].message); + if (response.error.errors) { + for (var key in response.error.errors) { + errors.push(response.error.errors[key].message); + } + } else { + errors.push(response.error) } if (errorCallback) { errorCallback(errors) |