diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js index 2d5c2614f..543a52c3e 100644 --- a/public/javascripts/stream.js +++ b/public/javascripts/stream.js @@ -80,7 +80,7 @@ var Stream = { }); $(".new_status_message").bind('ajax:failure', function(data, html , xhr) { - json = $.parseJSON(html.response); + json = $.parseJSON(html.responseText); if(json.errors.length != 0){ Diaspora.widgets.alert.alert(json.errors); }else{ diff --git a/public/javascripts/widgets/alert.js b/public/javascripts/widgets/alert.js index eeb359a5f..9dcf8ed4c 100644 --- a/public/javascripts/widgets/alert.js +++ b/public/javascripts/widgets/alert.js @@ -29,6 +29,6 @@ Diaspora.widgets.add("alert", function() { $.facebox({ div: "#diaspora_alert" - }); + }, 'diaspora_alert'); } -}); \ No newline at end of file +}); diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 76dd26a5d..8b6fee986 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -2378,6 +2378,8 @@ div.dislikes #facebox .close :display none + .diaspora_alert~.close + :display block #aspect_edit_controls :margin