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

public/javascripts/stream.js

@@ -24,6 +24,7 @@ var Stream = {
     $stream.delegate("textarea.comment_box", "keydown", function(e){
       if (e.keyCode === 13) {
         if(!e.shiftKey) {
+          $(this).blur();
           $(this).closest("form").submit();
         }
       }

public/javascripts/view.js

@@ -33,10 +33,6 @@ var View = {
     $(this.gettingStarted.selector)
       .live("click", this.gettingStarted.click);
 
-    /* Submitting the status message form when the user hits enter */
-    $(this.publisher.selector)
-      .keydown(this.publisher.keydown);
-
     /* User menu */
     $(this.userMenu.selector)
       .click(this.userMenu.click);
@@ -126,17 +122,6 @@ var View = {
     selector: ".new_request"
   },
 
-  publisher: {
-    keydown: function(e) {
-      if(e.keyCode === 13) {
-        if(!e.shiftKey) {
-          $(this).closest("form").submit();
-        }
-      }
-    },
-    selector: "#publisher textarea"
-  },
-
   search: {
     blur: function() {
       $(this).removeClass("active");