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

app/controllers/status_messages_controller.rb

@@ -2,7 +2,7 @@ class StatusMessagesController < ApplicationController
   before_filter :authenticate_user!
 
   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])
     
     if @status_message.created_at

app/views/layouts/application.html.haml

@@ -17,7 +17,7 @@
     
     = 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'
     
     = csrf_meta_tag

public/javascripts/publisher.js

-$(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);
-    }
-  }
-
-});