Skip to content

Adding xmin, xmax, ymin and ymax variables to track window boundaries #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
krzyko wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adding xmin, xmax, ymin and ymax variables to track window boundaries #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 25 additions & 5 deletions dist/scrollProgress.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,15 @@
// set initial values
this._viewportHeight = this._getViewportHeight();
this._viewportWidth = this._getViewportWidth();
this._scrollHeight = document.body.scrollHeight;
this._scrollWidth = document.body.scrollWidth;
this._innerHeight = window.innerHeight;
this._innerWidth = window.innerWidth;

this._progress = this._getProgress();

// trigger initial update function
this._handleUpdate(this._progress.x, this._progress.y);
this._handleUpdate(this._progress.x, this._progress.y, this._progress.xmin, this._progress.xmax, this._progress.ymin, this._progress.ymax);

// bind event functions
this._onScroll = this._onScroll.bind(this);
Expand Down Expand Up @@ -79,7 +83,19 @@
: x / this._viewportWidth,
y: this._viewportHeight === 0
? 0
: y / this._viewportHeight
: y / this._viewportHeight,
xmin: this._scrollWidth === this._innerWidth
? 0
: x / this._scrollWidth,
xmax: this._scrollWidth === this._innerWidth
? 0
: (x + this._innerWidth) / this._scrollWidth,
ymin: this._scrollHeight === this._innerHeight
? 0
: y / this._scrollHeight,
ymax: this._scrollHeight === this._innerHeight
? 0
: (y + this._innerHeight) / this._scrollHeight
};
};

Expand All @@ -90,7 +106,7 @@
*/
ScrollProgress.prototype._onScroll = function() {
this._progress = this._getProgress();
this._handleUpdate(this._progress.x, this._progress.y);
this._handleUpdate(this._progress.x, this._progress.y, this._progress.xmin, this._progress.xmax, this._progress.ymin, this._progress.ymax);
};

/**
Expand All @@ -101,11 +117,15 @@
ScrollProgress.prototype._onResize = function() {
this._viewportHeight = this._getViewportHeight();
this._viewportWidth = this._getViewportWidth();
this._scrollHeight = document.body.scrollHeight;
this._scrollWidth = document.body.scrollWidth;
this._innerHeight = window.innerHeight;
this._innerWidth = window.innerWidth;

this._progress = this._getProgress();

// trigger update function
this._handleUpdate(this._progress.x, this._progress.y);
this._handleUpdate(this._progress.x, this._progress.y, this._progress.xmin, this._progress.xmax, this._progress.ymin, this._progress.ymax);
};

/**
Expand All @@ -114,7 +134,7 @@
* @returns {undefined}
*/
ScrollProgress.prototype.trigger = function() {
this._handleUpdate(this._progress.x, this._progress.y);
this._handleUpdate(this._progress.x, this._progress.y, this._progress.xmin, this._progress.xmax, this._progress.ymin, this._progress.ymax);
};

/**
Expand Down
30 changes: 25 additions & 5 deletions src/scrollProgress.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,15 @@ var ScrollProgress = function(handleUpdate) {
// set initial values
this._viewportHeight = this._getViewportHeight();
this._viewportWidth = this._getViewportWidth();
this._scrollHeight = document.body.scrollHeight;
this._scrollWidth = document.body.scrollWidth;
this._innerHeight = window.innerHeight;
this._innerWidth = window.innerWidth;

this._progress = this._getProgress();

// trigger initial update function
this._handleUpdate(this._progress.x, this._progress.y);
this._handleUpdate(this._progress.x, this._progress.y, this._progress.xmin, this._progress.xmax, this._progress.ymin, this._progress.ymax);

// bind event functions
this._onScroll = this._onScroll.bind(this);
Expand Down Expand Up @@ -72,7 +76,19 @@ ScrollProgress.prototype._getProgress = function() {
: x / this._viewportWidth,
y: this._viewportHeight === 0
? 0
: y / this._viewportHeight
: y / this._viewportHeight,
xmin: this._scrollWidth === this._innerWidth
? 0
: x / this._scrollWidth,
xmax: this._scrollWidth === this._innerWidth
? 0
: (x + this._innerWidth) / this._scrollWidth,
ymin: this._scrollHeight === this._innerHeight
? 0
: y / this._scrollHeight,
ymax: this._scrollHeight === this._innerHeight
? 0
: (y + this._innerHeight) / this._scrollHeight
};
};

Expand All @@ -83,7 +99,7 @@ ScrollProgress.prototype._getProgress = function() {
*/
ScrollProgress.prototype._onScroll = function() {
this._progress = this._getProgress();
this._handleUpdate(this._progress.x, this._progress.y);
this._handleUpdate(this._progress.x, this._progress.y, this._progress.xmin, this._progress.xmax, this._progress.ymin, this._progress.ymax);
};

/**
Expand All @@ -94,11 +110,15 @@ ScrollProgress.prototype._onScroll = function() {
ScrollProgress.prototype._onResize = function() {
this._viewportHeight = this._getViewportHeight();
this._viewportWidth = this._getViewportWidth();
this._scrollHeight = document.body.scrollHeight;
this._scrollWidth = document.body.scrollWidth;
this._innerHeight = window.innerHeight;
this._innerWidth = window.innerWidth;

this._progress = this._getProgress();

// trigger update function
this._handleUpdate(this._progress.x, this._progress.y);
this._handleUpdate(this._progress.x, this._progress.y, this._progress.xmin, this._progress.xmax, this._progress.ymin, this._progress.ymax);
};

/**
Expand All @@ -107,7 +127,7 @@ ScrollProgress.prototype._onResize = function() {
* @returns {undefined}
*/
ScrollProgress.prototype.trigger = function() {
this._handleUpdate(this._progress.x, this._progress.y);
this._handleUpdate(this._progress.x, this._progress.y, this._progress.xmin, this._progress.xmax, this._progress.ymin, this._progress.ymax);
};

/**
Expand Down