Skip to content

Commit c735a2a

Browse files
committed
a fix for #8
1 parent fe10649 commit c735a2a

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

Gruntfile.coffee

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module.exports = (grunt) ->
1313
connect:
1414
app:
1515
options:
16-
base: './src/'
16+
base: './'
1717
middleware: require './server/middleware'
1818
port: 5001
1919
watch:

server/middleware.coffee

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = (connect, options) ->
88
app.use express.bodyParser()
99
app.use express.methodOverride()
1010
app.use express.errorHandler()
11-
app.use express.static options.base
11+
app.use express.static options.base[0]
1212
app.use app.router
1313
routes app, options
1414
[connect(app)]

src/ui-scroll.coffee

+10-6
Original file line numberDiff line numberDiff line change
@@ -308,18 +308,22 @@ angular.module('ui.scroll', [])
308308

309309
# We need the item bindings to be processed before we can do adjustment
310310
$timeout ->
311+
311312
for wrapper in toBePrepended
312313
builder.insertElement wrapper.element
313-
# an element is inserted at the top
314-
newHeight = builder.topPadding() - wrapper.element.outerHeight(true)
314+
prepFirst = prepFirst || wrapper.element # element prepended first
315+
prepLast = wrapper.element # element prepended last
316+
wrapper.op = 'none'
317+
318+
if prepFirst
319+
heightIncrement = prepFirst.next().offset().top - prepLast.offset().top
315320
# adjust padding to prevent it from visually pushing everything down
316-
if newHeight >= 0
321+
if builder.topPadding() >= heightIncrement
317322
# if possible, reduce topPadding
318-
builder.topPadding(newHeight)
323+
builder.topPadding(builder.topPadding() - heightIncrement)
319324
else
320325
# if not, increment scrollTop
321-
viewport.scrollTop(viewport.scrollTop() + wrapper.element.outerHeight(true))
322-
wrapper.op = 'none'
326+
viewport.scrollTop(viewport.scrollTop() + heightIncrement)
323327

324328
for wrapper in toBeRemoved
325329
promises = promises.concat (removeItem wrapper)

0 commit comments

Comments
 (0)