Skip to content
This repository was archived by the owner on Aug 5, 2020. It is now read-only.

A fix for getting scrollTop position on the latest Chrome 61 #14

Open
vmarta wants to merge 5 commits into
base: master
Choose a base branch
from
Open

A fix for getting scrollTop position on the latest Chrome 61 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cf4d513
A workaround for getting scroll position on latest Chrome 61 on Android
vmarta Oct 24, 2017
fe72cd0
A more robust fix to get the scrolling element
vmarta Oct 24, 2017
5f5bf27
Oops forgot semicolon
vmarta Oct 24, 2017
2ef30f3
Update dist/
vmarta Oct 24, 2017
0a2e890
Increment patch version number
vmarta Oct 24, 2017
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
3 changes: 3 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
1.1.4
- Fixes issue on latest Chrome 61 on Android re: scroll position.
Now using a more standard way to retrieve the scrolling element.
1.1.3
- Use iOS7 background scrolling fix with lockup. Also fixes an issue with
input focus competing with browser scroll on focusing on inputs.
Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lockup",
"version": "1.1.3",
"version": "1.1.4",
"homepage": "https://github.com/mobify/lockup",
"authors": [
"Mobify <jobs@mobify.com>"
Expand Down
5 changes: 3 additions & 2 deletions dist/lockup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
Lockup.__super__.call(this, element, options, Lockup.DEFAULTS);
}

Lockup.VERSION = '1.1.3';
Lockup.VERSION = '1.1.4';

Lockup.DEFAULTS = {
container: null,
Expand All @@ -44,6 +44,7 @@
this.$html = $('html');
this.$body = $('body');
this.$doc = $(document);
this.$scrollingEl = $(document.scrollingElement || document.documentElement);

this.$container = this._buildContainer();

Expand Down Expand Up @@ -125,7 +126,7 @@
return parseInt(self.$body.css('padding-' + position));
};

this.scrollPosition = this.$body.scrollTop();
this.scrollPosition = this.$scrollingEl.scrollTop();

this.$doc.off('touchmove', this._preventDefault);

Expand Down
4 changes: 2 additions & 2 deletions dist/lockup.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"type" : "git",
"url" : "https://github.com/mobify/lockup.git"
},
"version": "1.1.3",
"version": "1.1.4",
"description": "A mobile first scroll blocking plugin",
"devDependencies": {
"chai": "~1.9.0",
Expand Down
3 changes: 2 additions & 1 deletion src/js/lockup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
this.$html = $('html');
this.$body = $('body');
this.$doc = $(document);
this.$scrollingEl = $(document.scrollingElement || document.documentElement);

this.$container = this._buildContainer();

Expand Down Expand Up @@ -125,7 +126,7 @@
return parseInt(self.$body.css('padding-' + position));
};

this.scrollPosition = this.$body.scrollTop();
this.scrollPosition = this.$scrollingEl.scrollTop();

this.$doc.off('touchmove', this._preventDefault);

Expand Down