Skip to content

Commit 1bbc5d8

Browse files
committed
viewport.offset when viewport is the window fix
1 parent e583ffe commit 1bbc5d8

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/ui-scroll.coffee

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ angular.module('ui.scroll', [])
140140
offset = buffer.minIndex - (Math.min buffer.minIndex, datasource.minIndex || Number.MAX_VALUE)
141141
datasource.minIndex = (buffer.minIndex -= offset)
142142
datasource.maxIndex = buffer.maxIndex = Math.max buffer.maxIndex, datasource.maxIndex || Number.MIN_VALUE
143-
console.log "offset #{offset}"
144143
offset
145144

146145
# clears the buffer
@@ -201,12 +200,14 @@ angular.module('ui.scroll', [])
201200
viewport.shouldLoadBottom = ->
202201
!buffer.eof && viewport.bottomDataPos() < viewport.bottomVisiblePos() + bufferPadding()
203202

203+
viewportOffset = if viewport.offset() then -> viewport.offset() else -> {top:0}
204+
204205
viewport.clipBottom = ->
205206
# clip the invisible items off the bottom
206207
overage = 0
207208
for i in [buffer.length-1..0]
208209
item = buffer[i]
209-
if item.element.offset().top - viewport.offset().top > viewport.outerHeight() + bufferPadding()
210+
if item.element.offset().top - viewportOffset().top > viewport.outerHeight() + bufferPadding()
210211
overage++
211212
else break
212213
if overage > 0
@@ -223,7 +224,7 @@ angular.module('ui.scroll', [])
223224
overage = 0
224225
overageHeight = 0
225226
for item in buffer
226-
if item.element.offset().top - viewport.offset().top + item.element.outerHeight(true) < (-1) * bufferPadding()
227+
if item.element.offset().top - viewportOffset().top + item.element.outerHeight(true) < (-1) * bufferPadding()
227228
overageHeight += item.element.outerHeight(true)
228229
overage++
229230
else break

0 commit comments

Comments
 (0)