shift+enter submits new messages/comments

public/javascripts/stream.js

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

public/javascripts/view.js

@@ -35,7 +35,7 @@ var View = {
 
     /* Submitting the status message form when the user hits enter */
     $(this.publisher.selector)
-      .keyup(this.publisher.keyup);
+      .keydown(this.publisher.keydown);
 
     /* User menu */
     $(this.userMenu.selector)
@@ -118,8 +118,8 @@ var View = {
   },
 
   publisher: {
-    keyup: function(e) {
-      if(e.keyCode === 13) {
+    keydown: function(e) {
+      if(e.shiftKey && e.keyCode === 13) {
         $(this).closest("form").submit();
       }
     },

spec/javascripts/view-spec.js

@@ -102,19 +102,20 @@ describe("View", function() {
       );
     });
 
-    describe("keyup", function() { 
+    describe("keydown", function() { 
       it("is called when the user types", function() {
-        spyOn(View.publisher, "keyup");
+        spyOn(View.publisher, "keydown");
         View.initialize();
-        $(View.publisher.selector).trigger("keyup");
-        expect(View.publisher.keyup).toHaveBeenCalled();
+        $(View.publisher.selector).trigger("keydown");
+        expect(View.publisher.keydown).toHaveBeenCalled();
       });
 
       it("submits the form if the user hits enter while the textarea is focused", function() {
         spyOn($.fn, "submit");
         View.initialize();
         $(View.publisher.selector).focus();
-        var event = $.Event("keyup");
+        var event = $.Event("keydown");
+        var event.ShiftKey = true;
         event.keyCode = 13;
         $(View.publisher.selector).trigger(event);
         expect($.fn.submit).toHaveBeenCalled();