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

shift+enter submits new messages/comments

Browse source
This commit is contained in:
danielvincent 2010-12-07 21:30:29 -08:00
parent 5c1c31b2b2
commit b94e6ae4a0
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/javascripts/stream.js
View file

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

6
public/javascripts/view.js
View file

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

11
spec/javascripts/view-spec.js
View file

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