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:
maxwell 2011-01-07 16:15:25 -08:00
commit 3641470399
2 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
public/javascripts/stream.js
View file

@ -24,6 +24,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.keyCode === 13) {
if(!e.shiftKey) { if(!e.shiftKey) {
$(this).blur();
$(this).closest("form").submit(); $(this).closest("form").submit();
} }
} }

15
public/javascripts/view.js
View file

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