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

Merge branch 'reoponed_issue3897' of https://github.com/RoonyH/diaspora into RoonyH-reoponed_issue3897

Browse source
This commit is contained in:
Florian Staudacher 2013-06-04 16:41:21 +02:00
commit b7b4edeeb0
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -14,6 +14,7 @@
* Fix tags ordering in chrome [#4133](https://github.com/diaspora/diaspora/issues/4133) * Fix tags ordering in chrome [#4133](https://github.com/diaspora/diaspora/issues/4133)
* Fix src URL for oEmbed iFrame [#4178](https://github.com/diaspora/diaspora/pull/4178) * Fix src URL for oEmbed iFrame [#4178](https://github.com/diaspora/diaspora/pull/4178)
* Add back-to-top button on tag and user pages [#4185](https://github.com/diaspora/diaspora/issues/4185) * Add back-to-top button on tag and user pages [#4185](https://github.com/diaspora/diaspora/issues/4185)
* Fix reopened issue by changing the comment/post submit keyboard sortcut to ctrl+enter from shift+enter [#3897](https://github.com/diaspora/diaspora/issues/3897)
## Features ## Features

2
app/assets/javascripts/app/views/comment_stream_view.js
View file

@ -53,7 +53,7 @@ app.views.CommentStream = app.views.Base.extend({
}, },
keyDownOnCommentBox: function(evt) { keyDownOnCommentBox: function(evt) {
if(evt.keyCode == 13 && evt.shiftKey) { if(evt.keyCode == 13 && evt.ctrlKey) {
this.$("form").submit() this.$("form").submit()
return false; return false;
} }

2
app/assets/javascripts/app/views/publisher_view.js
View file

@ -210,7 +210,7 @@ app.views.Publisher = Backbone.View.extend(_.extend(
}, },
keyDown : function(evt) { keyDown : function(evt) {
if( evt.keyCode == 13 && evt.shiftKey ) { if( evt.keyCode == 13 && evt.ctrlKey ) {
this.$("form").submit(); this.$("form").submit();
this.open(); this.open();
return false; return false;

4
spec/javascripts/app/views/comment_stream_view_spec.js
View file

@ -94,14 +94,14 @@ describe("app.views.CommentStream", function(){
expect(submitCallback).not.toHaveBeenCalled(); expect(submitCallback).not.toHaveBeenCalled();
}) })
it("should submit the form when enter is pressed with shift", function(){ it("should submit the form when enter is pressed with ctrl", function(){
this.view.render(); this.view.render();
var form = this.view.$("form") var form = this.view.$("form")
var submitCallback = jasmine.createSpy().andReturn(false); var submitCallback = jasmine.createSpy().andReturn(false);
form.submit(submitCallback); form.submit(submitCallback);
var e = $.Event("keydown", { keyCode: 13 }); var e = $.Event("keydown", { keyCode: 13 });
e.shiftKey = true; e.ctrlKey = true;
this.view.keyDownOnCommentBox(e); this.view.keyDownOnCommentBox(e);
expect(submitCallback).toHaveBeenCalled(); expect(submitCallback).toHaveBeenCalled();

4
spec/javascripts/app/views/publisher_view_spec.js
View file

@ -116,14 +116,14 @@ describe("app.views.Publisher", function() {
}); });
describe("publishing a post with keyboard", function(){ describe("publishing a post with keyboard", function(){
it("should submit the form when shift+enter is pressed", function(){ it("should submit the form when ctrl+enter is pressed", function(){
this.view.render(); this.view.render();
var form = this.view.$("form") var form = this.view.$("form")
var submitCallback = jasmine.createSpy().andReturn(false); var submitCallback = jasmine.createSpy().andReturn(false);
form.submit(submitCallback); form.submit(submitCallback);
var e = $.Event("keydown", { keyCode: 13 }); var e = $.Event("keydown", { keyCode: 13 });
e.shiftKey = true; e.ctrlKey = true;
this.view.keyDown(e); this.view.keyDown(e);
expect(submitCallback).toHaveBeenCalled(); expect(submitCallback).toHaveBeenCalled();