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

messy application.haml file i know, but now the sockets only update pages which want their data

Browse source
This commit is contained in:
maxwell 2010-06-22 18:59:11 -07:00
parent 94de043862
commit fd5d7c63ad
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -32,6 +32,7 @@ end
group :development do
gem "nifty-generators"
gem "ruby-debug"
end
group :deployment do

31
app/views/layouts/application.html.haml
View file

@ -2,7 +2,7 @@
%html
%head
%title
= yield(:title) || "Untitled"
= yield(:title) || "diaspora"
%meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
= stylesheet_link_tag "blueprint/screen", :media => 'screen'
@ -29,13 +29,14 @@
ws = new WebSocket("ws://#{request.host}:8080/");
ws.onmessage = function(evt) {
$("#stream").prepend($(evt.data).fadeIn("fast"));
};
var obj = jQuery.parseJSON(evt.data);
if((location.href.indexOf(obj['class']) != -1 ) || (location.pathname == '/')) {
$("#stream").prepend($(obj['html']).fadeIn("fast"));
};
}
ws.onclose = function() { debug("socket closed"); };
ws.onopen = function() {
debug("connected...");
//ws.send("hello server");
// ws.send("hello again");
};
});
@ -55,16 +56,16 @@
// wait for the DOM to be loaded
// bind 'myForm' and provide a simple callback function
$('#new_status_message').ajaxForm(function() {
alert("Thank you for your comment!");
});
$('#new_bookmark').ajaxForm(function() {
alert("Thank you for your comment!");
});
$('#new_blog').ajaxForm(function() {
alert("Thank you for your comment!");
});
$('#new_status_message').ajaxForm(function() {
alert("Thank you for your comment!");
});
$('#new_bookmark').ajaxForm(function() {
alert("Thank you for your comment!");
});
$('#new_blog').ajaxForm(function() {
alert("Thank you for your comment!");
});
});
%body

6
config/initializers/socket.rb
View file

@ -29,9 +29,7 @@ module WebSocket
}
#this should get folded into message queue i think?
def self.update_clients(object)
n = @view.render(:partial => @view.type_partial(object), :locals => {:post => object})
@channel.push(n) if @channel
n = @view.render(:partial => @view.type_partial(object), :locals => {:post => object})
@channel.push({:class =>object.class.to_s.underscore.pluralize, :html => n}.to_json) if @channel
end
end