Skip to content

Correct visible view calculations when using a wrapper element #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
runspired merged 2 commits into from
Mar 25, 2015
Merged

Correct visible view calculations when using a wrapper element #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfa059e
Determine bottommost visible view for wrapped containers correctly.
rsutphin Mar 23, 2015
113f502
.position() is already relative to the scroll container.
rsutphin Mar 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions addon/views/cloaked-collection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,13 +96,11 @@ export default Ember.CollectionView.extend({
findTopView: function(childViews, viewportTop, min, max) {
if (max < min) { return min; }

var wrapperTop = this.get('wrapperTop')>>0;

while(max>min){
var mid = Math.floor((min + max) / 2),
// in case of not full-window scrolling
$view = childViews[mid].$(),
viewBottom = $view.position().top + wrapperTop + $view.height();
viewBottom = $view.position().top + $view.height();

if (viewBottom > viewportTop) {
max = mid-1;
Expand Down Expand Up @@ -159,9 +157,7 @@ export default Ember.CollectionView.extend({
while (bottomView < childViews.length) {
var view = childViews[bottomView],
$view = view.$(),
// in case of not full-window scrolling
scrollOffset = this.get('wrapperTop') || 0,
viewTop = $view.offset().top + scrollOffset,
viewTop = $view.position().top,
viewBottom = viewTop + $view.height();

if (viewTop > viewportBottom) { break; }
Expand Down