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

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
ilya 2010-09-12 22:56:29 -07:00
commit a738807cf4
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/models/user.rb
View file

@ -87,13 +87,6 @@ class User
end
group_ids = [group_ids.to_s] if group_ids.is_a? BSON::ObjectId
Rails.logger.debug("GROUP IDS FOR POST IS THIS:")
Rails.logger.debug(group_ids.inspect)
raise ArgumentError.new("You must post to someone.") if group_ids.nil? || group_ids.empty?
post = build_post(class_name, options)
@ -276,7 +269,7 @@ class User
groups.each{ |group|
group.posts << object
group.save
object.socket_to_uid(id, :group_id => group.id) if (object.respond_to?(:socket_to_uid) && !self.owns?(object))
object.socket_to_uid(id, :group_ids => [group.id]) if (object.respond_to?(:socket_to_uid) && !self.owns?(object))
}
end

3
app/views/js/_websocket_js.haml
View file

@ -46,8 +46,9 @@
$(html).fadeIn("fast", function(){})
);
toggler = $('.show_post_comments', post)
toggler.html(
toggler.html().replace(/\d/,$('.comment_set', post)[0].childElementCount -1));
toggler.html().replace(/\d+/,$('.comment_set', post)[0].childElementCount -1));
if( !$(".comments", post).is(':visible') ){
toggler.click();