Skip to content

Commit 9e6465c

Browse files
Add context option to Inview, fixes imakewebthings#433
1 parent 753bd7b commit 9e6465c

File tree

10 files changed

+13
-7
lines changed

10 files changed

+13
-7
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
- Pass the jQuery object of items added during an Infinite page load to the `onAfterPageLoad` callback. (Pull #398)
88
- Add `enabled` option, `enable` and `disable` methods to the Inview shortcut (Pull #406)
99
- Make the Inview instance `this` within the callbacks, rather than the invdividual underlying waypoints. (Issue #412)
10+
- Account for changes to jQuery 3 around calling `offset` on the window. (Pull #430)
11+
- Add `context` option to Inview. (Issue #433)
1012

1113
## v3.1.1
1214

lib/jquery.waypoints.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ https://github.com/imakewebthings/waypoints/blog/master/licenses.txt
348348
/*eslint-disable eqeqeq */
349349
var isWindow = this.element == this.element.window
350350
/*eslint-enable eqeqeq */
351-
var contextOffset = this.adapter.offset()
351+
var contextOffset = isWindow ? undefined : this.adapter.offset()
352352
var triggeredGroups = {}
353353
var axes
354354

lib/jquery.waypoints.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/noframework.waypoints.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ https://github.com/imakewebthings/waypoints/blog/master/licenses.txt
348348
/*eslint-disable eqeqeq */
349349
var isWindow = this.element == this.element.window
350350
/*eslint-enable eqeqeq */
351-
var contextOffset = this.adapter.offset()
351+
var contextOffset = isWindow ? undefined : this.adapter.offset()
352352
var triggeredGroups = {}
353353
var axes
354354

lib/noframework.waypoints.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/shortcuts/inview.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ https://github.com/imakewebthings/waypoints/blog/master/licenses.txt
7272
Inview.prototype.createWaypoint = function(config) {
7373
var self = this
7474
this.waypoints.push(new Waypoint({
75+
context: this.options.context,
7576
element: this.options.element,
7677
enabled: this.options.enabled,
7778
handler: (function(config) {
@@ -105,6 +106,7 @@ https://github.com/imakewebthings/waypoints/blog/master/licenses.txt
105106
}
106107

107108
Inview.defaults = {
109+
context: window,
108110
enabled: true,
109111
enter: noop,
110112
entered: noop,

lib/shortcuts/inview.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/zepto.waypoints.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ https://github.com/imakewebthings/waypoints/blog/master/licenses.txt
348348
/*eslint-disable eqeqeq */
349349
var isWindow = this.element == this.element.window
350350
/*eslint-enable eqeqeq */
351-
var contextOffset = this.adapter.offset()
351+
var contextOffset = isWindow ? undefined : this.adapter.offset()
352352
var triggeredGroups = {}
353353
var axes
354354

lib/zepto.waypoints.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/shortcuts/inview.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
Inview.prototype.createWaypoint = function(config) {
6767
var self = this
6868
this.waypoints.push(new Waypoint({
69+
context: this.options.context,
6970
element: this.options.element,
7071
enabled: this.options.enabled,
7172
handler: (function(config) {
@@ -99,6 +100,7 @@
99100
}
100101

101102
Inview.defaults = {
103+
context: window,
102104
enabled: true,
103105
enter: noop,
104106
entered: noop,

0 commit comments

Comments
 (0)