Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1969 from riking/scroll-position 

Put requested post in middle of page
This commit is contained in:
Sam 2014-02-18 16:17:26 +11:00
parent 983c7567aa 19922ff174
commit 887e835a9b
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/components/keyboard_shortcuts_component.js
View File

@ -127,7 +127,13 @@ Discourse.KeyboardShortcuts = Ember.Object.createWithMixins({
if ($article.size() > 0) { if ($article.size() > 0) {
$articles.removeClass('selected'); $articles.removeClass('selected');
$article.addClass('selected'); $article.addClass('selected');
this._scrollList($article);
var rgx = new RegExp("post-cloak-(\\d+)").exec($article.parent()[0].id);
if (rgx === null || typeof rgx[1] === 'undefined') {
this._scrollList($article);
} else {
Discourse.TopicView.jumpToPost(rgx[1]);
}
} }
}, },

3
app/assets/javascripts/discourse/views/topic_view.js
View File

@ -235,7 +235,8 @@ Discourse.TopicView.reopenClass({
new LockOn(holderId, {offsetCalculator: function() { new LockOn(holderId, {offsetCalculator: function() {
var $header = $('header'), var $header = $('header'),
$title = $('#topic-title'), $title = $('#topic-title'),
expectedOffset = $title.height() - $header.find('.contents').height(); windowHeight = $(window).height() - $title.height(),
expectedOffset = $title.height() - $header.find('.contents').height() + (windowHeight / 5);
return $header.outerHeight(true) + ((expectedOffset < 0) ? 0 : expectedOffset); return $header.outerHeight(true) + ((expectedOffset < 0) ? 0 : expectedOffset);
}}).lock(); }}).lock();