Skip to content
This repository was archived by the owner on Dec 16, 2025. It is now read-only.

Commit 24de4c1

Browse files
committed
fix poplockit when scrolling past a feed item with a short and a long column
1 parent 8e002c5 commit 24de4c1

File tree

6 files changed

+22
-16
lines changed

6 files changed

+22
-16
lines changed

CHANGELOG.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ Next Release
33

44
* Your contribution here.
55

6-
0.1.4 (TBD)
6+
0.1.4-6
77
===========
88

9-
* Fix: Correctly handle if right most column is very short
9+
* Fix: Correctly handle if various column sizes
1010

11-
0.1.3 (TBD)
11+
0.1.3
1212
===========
1313

1414
* Fix: Correctly handle if column is browser height
1515

16-
0.1.2 (TBD)
16+
0.1.2
1717
===========
1818

1919
* Fix: Correctly handle if left most column is longest column
2020

21-
0.1.1 (TBD)
21+
0.1.1
2222
===========
2323

2424
* Initial Public Release - [@zamiang](https://github.com/zamiang).

dist/poplockit.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/*! jQuery.popLockIt - v0.1.2 - 2013-09-20
1+
/*! jQuery.popLockIt - v0.1.2 - 2014-02-03
22
* http://zamiang.github.com/jquery.poplockit
3-
* Copyright (c) 2013 Brennan Moore; Licensed MIT */
3+
* Copyright (c) 2014 Brennan Moore; Licensed MIT */
44

55
(function() {
66
var __hasProp = {}.hasOwnProperty,
@@ -154,8 +154,10 @@
154154
return this.setPosition('fixed', 'south');
155155
}
156156
}
157-
if ((scrollTop + viewportHeight) >= this.bottom && this.height >= viewportHeight) {
158-
return this.setPosition('absolute', 'south');
157+
if (this.height >= viewportHeight) {
158+
if (scrollTop >= this.top + this.height) {
159+
return this.setPosition('absolute', 'south');
160+
}
159161
}
160162
return this.setPosition('absolute', 'north');
161163
};

dist/poplockit.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jquery.poplockit",
3-
"version": "0.1.5",
3+
"version": "0.1.6",
44
"main": "dist/poplockit.js",
55
"engines": {
66
"node": ">= 0.6.0"

0 commit comments

Comments
 (0)