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-08-24 16:05:43 -07:00
commit 0f04cad670
3 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/status_messages_controller.rb
View file

@ -2,7 +2,7 @@ class StatusMessagesController < ApplicationController
before_filter :authenticate_user! before_filter :authenticate_user!
def create def create
params[:status_message][:group_ids] = params[:group_ids] params[:status_message][:to] = params[:group_ids]
@status_message = current_user.post(:status_message, params[:status_message]) @status_message = current_user.post(:status_message, params[:status_message])
if @status_message.created_at if @status_message.created_at

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

@ -17,7 +17,7 @@
= javascript_include_tag 'fancybox/jquery.fancybox-1.3.1.pack' = javascript_include_tag 'fancybox/jquery.fancybox-1.3.1.pack'
= javascript_include_tag 'view', 'publisher', 'image_picker', 'group_nav' = javascript_include_tag 'view', 'image_picker', 'group_nav'
= render 'js/websocket_js' = render 'js/websocket_js'
= csrf_meta_tag = csrf_meta_tag

20
public/javascripts/publisher.js
View file

@ -1,20 +0,0 @@
$(document).ready( function() {
$("#publisher_content_pickers .status_message").click(selectPublisherTab);
$("#publisher_content_pickers .bookmark").click(selectPublisherTab);
$("#publisher_content_pickers .blog").click(selectPublisherTab);
$("#publisher_content_pickers .photo").click(selectPublisherTab);
function selectPublisherTab(evt){
evt.preventDefault();
var form_id = "#new_" + this.className
if( $(form_id).css("display") == "none" ) {
$("#publisher_content_pickers").children("li").removeClass("selected");
$("#publisher_form form").fadeOut(50);
$(this).toggleClass("selected");
$(form_id).delay(50).fadeIn(200);
}
}
});