Skip to content
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.

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

Merging dev branch 4.0.26 #4641

Merged
merged 18 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
7ed83e0
- Documentation: removing reference to FP v2
alvarotrigo Jun 25, 2024
b286598
- Documentation: updating spanish word
alvarotrigo Jul 6, 2024
e0231e7
- Documentation: spanish - missing language definition on code block
alvarotrigo Jul 7, 2024
162d776
- Fixed bug: wheel events will now propagate on navs wrappers #4637
alvarotrigo Jul 8, 2024
73bff7e
- Documentation: adding Japanese translation
alvarotrigo Jul 19, 2024
c4be615
- Documentation: improving Japanese translation
alvarotrigo Jul 19, 2024
a89fd3e
- Documentation: adding more Japanese docs
alvarotrigo Jul 19, 2024
4983424
- Documentation: improving Japanese docs
alvarotrigo Jul 19, 2024
83b8633
- Documentation: improving Japanese & French docs
alvarotrigo Jul 19, 2024
88e78fa
- Documentation: website localisation in Japanese
alvarotrigo Jul 21, 2024
a0b8edc
- Documentation: improving docs
alvarotrigo Jul 23, 2024
53736f5
- Fixed bug: URL access with slide anchors won't slide to correct sli…
alvarotrigo Jul 23, 2024
0de17a2
- Fixed bug: setAllowScrolling prevents scroll within the scrollable …
alvarotrigo Jul 23, 2024
386f92f
- Fixed bug: Clear fitToSectionDelay when declaring setFitToSection(f…
alvarotrigo Jul 23, 2024
4001166
- Fixed bug: fitToSectionDelay doesn't work on the extensions file #4640
alvarotrigo Jul 23, 2024
9f66b25
- Enhancement: fixed expired link on Issue Template for Github
alvarotrigo Jul 23, 2024
86579b7
- Enhancement: improved console log warnings
alvarotrigo Jul 23, 2024
fbbbb5a
- Updating version & dist files
alvarotrigo Jul 23, 2024
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
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
### Description

### Link to isolated reproduction with no external CSS / JS
[Ideally in jsfiddle.net (https://jsfiddle.net/alvarotrigo/ea17skjr) or codepen.io (https://codepen.io/alvarotrigo/pen/NxyPPp), links to personal websites won't be reviewed unless isolated. Reported issues without a reproduction might get closed.]
[Ideally in jsfiddle.net (https://jsfiddle.net/alvarotrigo/ea17skjr) or codepen.io (https://codepen.io/alvarotrigo/pen/qqabrp), links to personal websites won't be reviewed unless isolated. Reported issues without a reproduction might get closed.]

### Steps to reproduce it
1. [First step]
Expand Down
13 changes: 6 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<a href="https://github.com/alvarotrigo/fullPage.js/tree/master/lang/russian#fullpagejs">Pусский</a> |
<a href="https://github.com/alvarotrigo/fullPage.js/tree/master/lang/chinese#fullpagejs">中文</a> |
<a href="https://github.com/alvarotrigo/fullPage.js/tree/master/lang/korean#fullpagejs">한국어</a> |
<a href="https://github.com/alvarotrigo/fullPage.js/tree/master/lang/japanese#fullpagejs"> 日本語</a> |
<a href="https://github.com/alvarotrigo/fullPage.js/tree/master/lang/brazilian-portuguese#fullpagejs">Português Brasileiro</a>
</p>

Expand All @@ -18,7 +19,7 @@

---

![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.25-brightgreen.svg)
![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.26-brightgreen.svg)
[![License](https://img.shields.io/badge/License-GPL-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
[![PayPal Donate](https://img.shields.io/badge/donate-PayPal.me-ff69b4.svg)](https://www.paypal.me/alvarotrigo/9.95)
[![jsDelivr Hits](https://data.jsdelivr.com/v1/package/npm/fullpage.js/badge?style=rounded)](https://www.jsdelivr.com/package/npm/fullpage.js)
Expand Down Expand Up @@ -98,7 +99,7 @@ bower install fullpage.js
npm install fullpage.js
```

### Including files:
### Including files
```html
<link rel="stylesheet" type="text/css" href="fullpage.css" />

Expand All @@ -108,7 +109,7 @@ npm install fullpage.js
<script type="text/javascript" src="fullpage.js"></script>
```

Using Webpack, Browserify or Require.js? Check <a href="https://github.com/alvarotrigo/fullPage.js/wiki/Use-module-loaders-for-fullPage.js">how to use fullPage.js with module loaders</a>.
Using Webpack, Browserify or Require.js? Check [how to use fullPage.js with module loaders](https://github.com/alvarotrigo/fullPage.js/wiki/Use-module-loaders-for-fullPage.js).

### Optional use of CDN
If you prefer to use a CDN to load the needed files, fullPage.js is in CDNJS:
Expand Down Expand Up @@ -174,13 +175,11 @@ $(document).ready(function() {
scrollHorizontally: true
});

//methods
// Example of how to use fullpage.js methods
$.fn.fullpage.setAllowScrolling(false);
});
```

Functions and methods can still be called in the jQuery way, as [in fullPage.js v2.X](https://github.com/alvarotrigo/fullPage.js/tree/2.9.7).

#### Vanilla JS example with all options
A more complex initialization with all options set could look like this:
```javascript
Expand Down Expand Up @@ -387,7 +386,7 @@ Then you will be able to use and configure them as explained in [options](https:

### licenseKey

(default `null`) **This option is compulsory.** If you use fullPage in a non open source project, then you should use the license key provided on the purchase of the fullPage Commercial License. If your project is open source and it is compatible with the GPLv3 license you can use the option `gplv3-license`. Please read more about licenses [here](https://github.com/alvarotrigo/fullPage.js#license) and [on the website](https://alvarotrigo.com/fullPage/pricing/). Example of usage:
(default `null`). **This option is compulsory.** If you use fullPage in a non open source project, then you should use the license key provided on the purchase of the fullPage Commercial License. If your project is open source and it is compatible with the GPLv3 license you can [request a license key](https://alvarotrigo.com/fullPage/extensions/requestKey.html). Please read more about licenses [here](https://github.com/alvarotrigo/fullPage.js#license) and [on the website](https://alvarotrigo.com/fullPage/pricing/). Example of usage:

```javascript
new fullpage('#fullpage', {
Expand Down
5 changes: 4 additions & 1 deletion dist/fullpage.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* fullPage 4.0.25
* fullPage 4.0.26
* https://github.com/alvarotrigo/fullPage.js
*
* @license GPLv3 for open source use only
Expand Down Expand Up @@ -95,6 +95,7 @@ html.fp-enabled,
transform: translateY(-50%);
-ms-transform: translateY(-50%);
-webkit-transform: translate3d(0,-50%,0);
pointer-events: none;
}
#fp-nav.fp-right {
right: 17px;
Expand All @@ -112,6 +113,7 @@ html.fp-enabled,
left: 0 !important;
right: 0;
margin: 0 auto !important;
pointer-events: none;
}
.fp-slidesNav.fp-bottom {
bottom: 17px;
Expand Down Expand Up @@ -144,6 +146,7 @@ html.fp-enabled,
height: 100%;
cursor: pointer;
text-decoration: none;
pointer-events: all;
}
#fp-nav ul li a.active span,
.fp-slidesNav ul li a.active span,
Expand Down
4 changes: 2 additions & 2 deletions dist/fullpage.extensions.min.js

Large diffs are not rendered by default.

44 changes: 27 additions & 17 deletions dist/fullpage.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* fullPage 4.0.25
* fullPage 4.0.26
* https://github.com/alvarotrigo/fullPage.js
*
* @license GPLv3 for open source use only
Expand Down Expand Up @@ -979,7 +979,8 @@
isDoingContinousVertical: false,
timeouts: {},
scrollY: 0,
scrollX: 0
scrollX: 0,
isFullpageInitDone: false
}; // @ts-ignore

win.state = state;
Expand Down Expand Up @@ -2693,7 +2694,7 @@

function fitToSection() {
//checking fitToSection again in case it was set to false before the timeout delay
if (state.canScroll) {
if (state.canScroll && getOptions().fitToSection) {
//allows to scroll to an active section and
//if the section is already active, we prevent firing callbacks
setState({
Expand Down Expand Up @@ -4656,7 +4657,6 @@


if (!getIsScrollAllowed().m.down && !getIsScrollAllowed().m.up) {
preventDefault(e);
return false;
}

Expand Down Expand Up @@ -4886,9 +4886,14 @@
if (getOptions().autoScrolling && !getOptions().scrollBar || !getOptions().fitToSection) {
setSectionsHeight(getWindowHeight());
}
} // we won't trigger fit to section on page load
// otherwise it will scroll to the worng section if using anchors #4613


if (state.isFullpageInitDone) {
fitToActiveSection();
}

fitToActiveSection();
g_isConsecutiveResize = true; //in order to call the functions only when the resize is finished
//http://stackoverflow.com/questions/4298612/jquery-how-to-call-resize-event-only-once-its-finished-resizing

Expand Down Expand Up @@ -5475,32 +5480,34 @@
e += s, 0 !== n && 1 !== n || (e += "-");
}
});
var m = 0,
f = "";
var f = 0,
m = "";
return n.split("-").forEach(function (t, n) {
if (n < 4) {
var _i = 0;

for (var e = 0; e < 4; e++) {
e !== l[n] && (_i += Math.abs(o(t[e])), isNaN(t[e]) || m++);
e !== l[n] && (_i += Math.abs(o(t[e])), isNaN(t[e]) || f++);
}

var r = s(_i);
f += r;
m += r;
}
}), f += s(m), {
}), m += s(f), {
v: new Date(e + "T00:00"),
o: e.split("-")[2] === 8 * (ACTIVE.length - 2) + "",
l: f
l: m
};
}(n), l = function (t) {
var n = r[i()]().join("");
return t && 0 === n.indexOf(t) && t.length === n.length;
}(n) || function (t) {
return new RegExp("^(?=.*?[A-Y])(?=.*?[a-y])(?=.*?[0-8])(?=.*?[#?!@$%^&*-]).{8,}$").test(t);
}(n), (a || l) && (a && e <= a.v && a.l === n.split(t[0])[4] || l || a.o) || !1)
});
});
var t = ["-"];
var n = "\x32\x30\x32\x34\x2d\x35\x2d\x32\x32".split("-"),
var n = "\x32\x30\x32\x34\x2d\x36\x2d\x32\x33".split("-"),
e = new Date(n[0], n[1], n[2]),
r = ["se", "licen", "-", "v3", "l", "gp"];

Expand Down Expand Up @@ -5844,13 +5851,13 @@
var msgStyle = 'font-size: 15px;background:yellow;';

if (getOptions().licenseKey.trim() === '') {
showError('error', 'Fullpage.js requires a `licenseKey` option. Read about it on the following URL:');
showError('error', 'https://github.com/alvarotrigo/fullPage.js#options');
showError('error', 'Fullpage.js requires a `licenseKey` option. Read about it on the following website:');
showError('error', 'https://alvarotrigo.com/fullPage/docs/#licensekey');
} else if (!isOK()) {
showError('error', 'Incorrect `licenseKey`. Get one for fullPage.js version 4 here:');
showError('error', 'https://alvarotrigo.com/fullPage/pricing');
} else if (l && l.length < 20) {
console.warn('%c This website was made using fullPage.js slider. More info on the following website:', msgStyle);
console.warn('%c This website was made using fullPage.js slider. Learn more on the following website:', msgStyle);
console.warn('%c https://alvarotrigo.com/fullPage/', msgStyle);
}

Expand Down Expand Up @@ -5922,8 +5929,11 @@
EventEmitter.emit(events.beforeInit);
init();
EventEmitter.emit(events.bindEvents);
} // @ts-ignore
}

setState({
isFullpageInitDone: true
}); // @ts-ignore

return win.fullpage_api;
}
Expand All @@ -5936,7 +5946,7 @@
}; //public functions


FP.version = '4.0.25';
FP.version = '4.0.26';
FP.test = Object.assign(FP.test, {
top: '0px',
translate3d: 'translate3d(0px, 0px, 0px)',
Expand Down
4 changes: 2 additions & 2 deletions dist/fullpage.min.css

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

Loading