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

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Dennis Schubert 2016-01-21 21:00:32 +01:00
commit ff867cd471
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Changelog.md
View file

@ -104,7 +104,10 @@ Contributions are very welcome, the hard work is done!
* Internationalize controller rescue\_from text [#6554](https://github.com/diaspora/diaspora/pull/6554) * Internationalize controller rescue\_from text [#6554](https://github.com/diaspora/diaspora/pull/6554)
# Bug fixes # Bug fixes
Fix plural rules handling more than wanted as "one" [#6630](https://github.com/diaspora/diaspora/pull/6630) * Fix plural rules handling more than wanted as "one" [#6630](https://github.com/diaspora/diaspora/pull/6630)
# Features
* Keyboard shortcuts now do work on profile pages as well [#6647](https://github.com/diaspora/diaspora/pull/6647/files)
# 0.5.6.0 # 0.5.6.0

1
app/assets/javascripts/app/pages/profile.js
View file

@ -89,6 +89,7 @@ app.pages.Profile = app.views.Base.extend({
if( this.model.get("is_own_profile") ) { if( this.model.get("is_own_profile") ) {
app.publisher = new app.views.Publisher({collection : app.stream.items}); app.publisher = new app.views.Publisher({collection : app.stream.items});
} }
app.shortcuts = app.shortcuts || new app.views.StreamShortcuts({el: $(document)});
return new view({model: app.stream}); return new view({model: app.stream});
}, },

10
features/desktop/keyboard_navigation.feature
View file

@ -46,3 +46,13 @@ Feature: Keyboard navigation
When I press the "J" key somewhere When I press the "J" key somewhere
And I press the "C" key somewhere And I press the "C" key somewhere
Then the first comment field should be open Then the first comment field should be open
Scenario: navigate downwards on a profile page
When I am on "alice@alice.alice"'s page
And I press the "J" key somewhere
Then post 1 should be highlighted
And I should have navigated to the highlighted post
When I press the "J" key somewhere
Then post 2 should be highlighted
And I should have navigated to the highlighted post