nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix js error; stream ajax success handler should expect json

Browse source
This commit is contained in:
Michael Nutt 2011-03-11 00:02:51 -05:00
parent ead1f80b08
commit c7362707b3
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/shared/_publisher.html.haml
View file

@ -19,7 +19,7 @@
= "(#{@aspect_ids.length} #{t('_aspects').downcase})" = "(#{@aspect_ids.length} #{t('_aspects').downcase})"
.content_creation .content_creation
= form_for(StatusMessage.new, :remote => true) do |status| = form_for(StatusMessage.new, :remote => true, :html => {"data-type" => "json"}) do |status|
= status.error_messages = status.error_messages
#file-upload #file-upload
= image_tag 'icons/photos.png' = image_tag 'icons/photos.png'

1
public/javascripts/stream.js
View file

@ -52,7 +52,6 @@ var Stream = {
}); });
$(".new_status_message").live('ajax:success', function(data, json, xhr) { $(".new_status_message").live('ajax:success', function(data, json, xhr) {
json = $.parseJSON(json);
WebSocketReceiver.addPostToStream(json.post_id, json.html); WebSocketReceiver.addPostToStream(json.post_id, json.html);
//collapse publisher //collapse publisher
Publisher.close(); Publisher.close();