Skip to content

Commit c2eff2b

Browse files
alvarotrigoalvarotrigo
authored
Merge pull request #4631 from alvarotrigo/dev
Merging dev branch 4.0.24
2 parents bbebac3 + c478b77 commit c2eff2b

File tree

21 files changed

+63
-156
lines changed

21 files changed

+63
-156
lines changed

‎README.md‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1176,24 +1176,7 @@ Want to build fullpage.js distribution files? Please see [Build Tasks](https://g
11761176

11771177
## Who is using fullPage.js
11781178

1179-
[![Google](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/google-4.png)](http://www.yourprimer.com/)
1180-
![Coca-cola](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/cocacola-4.png)
1181-
![eBay](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/ebay-4.png)
1182-
[![BBC](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/bbc-4.png)](http://www.bbc.co.uk/news/resources/idt-d88680d1-26f2-4863-be95-83298fd01e02)
1183-
![Sony](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/sony-4.png)
1184-
1185-
![Vodafone](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/vodafone-5.png)
1186-
![British Airways](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/british-airways-5.png)
1187-
![McDonalds](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/mcdonalds-6.png)
1188-
![EA](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/ea-6.png)
1189-
![Vogue](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/vogue-6.png)
1190-
![Mi](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/mi-6.png)
1191-
1192-
![Mercedes](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/mercedes-5.png)
1193-
![sym](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/sym-5.png)
1194-
![Bugatti](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/bugatti-5.png)
1195-
![eDarling](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/edarling-5.png)
1196-
![Ubisoft](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/ubisoft-5.png)
1179+
![Who is using fullPage.js](https://cdn.jsdelivr.net/gh/alvarotrigo/fullpage-assets/imgs/using-fullpage.png)
11971180

11981181
- http://www.bbc.co.uk/news/resources/idt-d88680d1-26f2-4863-be95-83298fd01e02
11991182
- http://medoff.ua/en/
@@ -1224,5 +1207,5 @@ Become a sponsor and get your logo on our README on Github with a link to your s
12241207
## Contributors
12251208

12261209
<a href="https://github.com/alvarotrigo/fullPage.js/graphs/contributors">
1227-
<img src="https://contrib.rocks/image?repo=alvarotrigo/fullPage.js&max=400&columns=25&anon=1" />
1210+
<img src="https://contrib.rocks/image?repo=alvarotrigo/fullPage.js&max=400&columns=25&anon=1&v=2" />
12281211
</a>

‎dist/fullpage.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* fullPage 4.0.23
2+
* fullPage 4.0.24
33
* https://github.com/alvarotrigo/fullPage.js
44
*
55
* @license GPLv3 for open source use only

‎dist/fullpage.extensions.min.js‎

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

‎dist/fullpage.js‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* fullPage 4.0.23
2+
* fullPage 4.0.24
33
* https://github.com/alvarotrigo/fullPage.js
44
*
55
* @license GPLv3 for open source use only
@@ -167,6 +167,12 @@
167167
shared: {}
168168
};
169169
var extensions = ['parallax', 'scrollOverflowReset', 'dragAndMove', 'offsetSections', 'fadingEffect', 'responsiveSlides', 'continuousHorizontal', 'interlockedSlides', 'scrollHorizontally', 'resetSliders', 'cards', 'dropEffect', 'waterEffect'];
170+
var isInsideIframe = function () {
171+
var inIframe = window.self !== window.top;
172+
return function () {
173+
return inIframe;
174+
};
175+
}();
170176

171177
/**
172178
* forEach polyfill for IE
@@ -2875,7 +2881,9 @@
28752881
timeBeforeReachingLimit: null,
28762882
timeLastScroll: null,
28772883
preventScrollWithMouseWheel: function preventScrollWithMouseWheel(e) {
2878-
if (!state.canScroll) {
2884+
var activeSection = getState().activeSection;
2885+
2886+
if (!state.canScroll || isInsideIframe() && getOptions().scrollOverflow && scrollOverflowHandler.isScrollable(activeSection) && scrollOverflowHandler.isScrolled(getState().wheelDirection, activeSection.item)) {
28792887
preventDefault(e);
28802888
return false;
28812889
}
@@ -4675,9 +4683,11 @@
46754683

46764684

46774685
scrollings.push(Math.abs(value)); //preventing to scroll the site on mouse wheel when scrollbar is present
4678-
//and preventing scroll of parent frames
46794686

4680-
preventDefault(e); //time difference between the last scroll and the current one
4687+
if (getOptions().scrollBar) {
4688+
preventDefault(e);
4689+
} //time difference between the last scroll and the current one
4690+
46814691

46824692
var timeDiff = curTime - prevTime;
46834693
prevTime = curTime; //haven't they scrolled in a while?
@@ -5490,7 +5500,7 @@
54905500
});
54915501
});
54925502
var t = ["-"];
5493-
var n = "\x32\x30\x32\x34\x2d\x35\x2d\x32\x30".split("-"),
5503+
var n = "\x32\x30\x32\x34\x2d\x35\x2d\x32\x31".split("-"),
54945504
e = new Date(n[0], n[1], n[2]),
54955505
r = ["se", "licen", "-", "v3", "l", "gp"];
54965506

@@ -5926,7 +5936,7 @@
59265936
}; //public functions
59275937

59285938

5929-
FP.version = '4.0.23';
5939+
FP.version = '4.0.24';
59305940
FP.test = Object.assign(FP.test, {
59315941
top: '0px',
59325942
translate3d: 'translate3d(0px, 0px, 0px)',

‎dist/fullpage.min.css‎

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

‎dist/fullpage.min.css.map‎

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

‎dist/fullpage.min.js‎

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

‎lang/brazilian-portuguese/README.md‎

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,24 +1111,7 @@ Quer buildar arquivos de distribuição do fullpage.js? Consulte [Tarefas de Bui
11111111

11121112
## Quem está usando o fullPage.js
11131113

1114-
[![Google](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/google-4.png)](http://www.yourprimer.com/)
1115-
![Coca-cola](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/cocacola-4.png)
1116-
![eBay](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/ebay-4.png)
1117-
[![BBC](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/bbc-4.png)](http://www.bbc.co.uk/news/resources/idt-d88680d1-26f2-4863-be95-83298fd01e02)
1118-
![Sony](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/sony-4.png)
1119-
1120-
![Vodafone](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/vodafone-5.png)
1121-
![British Airways](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/british-airways-5.png)
1122-
![McDonalds](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/mcdonalds-6.png)
1123-
![EA](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/ea-6.png)
1124-
![Vogue](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/vogue-6.png)
1125-
![Mi](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/mi-6.png)
1126-
1127-
![Mercedes](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/mercedes-5.png)
1128-
![sym](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/sym-5.png)
1129-
![Bugatti](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/bugatti-5.png)
1130-
![eDarling](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/edarling-5.png)
1131-
![Ubisoft](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/ubisoft-5.png)
1114+
![Who is using fullPage.js](https://cdn.jsdelivr.net/gh/alvarotrigo/fullpage-assets/imgs/using-fullpage.png)
11321115

11331116
- http://www.bbc.co.uk/news/resources/idt-d88680d1-26f2-4863-be95-83298fd01e02
11341117
- http://medoff.ua/en/
@@ -1152,6 +1135,7 @@ Torne-se um patrocinador e obtenha seu logotipo em nosso README no Github com um
11521135
[![CodePen](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/codepen3.png)](https://codepen.com)
11531136

11541137
### Pessoas
1155-
<a href="https://github.com/donsalvadori" target="_blank" rel="nofollow">
1156-
<img src="http://wallpapers-for-ipad.com/fullpage/imgs3/avatars/donsalvadori.jpg">
1138+
1139+
<a href="https://github.com/alvarotrigo/fullPage.js/graphs/contributors">
1140+
<img src="https://contrib.rocks/image?repo=alvarotrigo/fullPage.js&max=400&columns=25&anon=1&v=2" />
11571141
</a>

‎lang/chinese/README.md‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,24 +1097,7 @@ new fullpage('#fullpage', {
10971097

10981098
## 谁在使用 fullPage.js
10991099

1100-
[![Google](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/google-4.png)](http://www.yourprimer.com/)
1101-
![Coca-cola](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/cocacola-4.png)
1102-
![eBay](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/ebay-4.png)
1103-
[![BBC](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/bbc-4.png)](http://www.bbc.co.uk/news/resources/idt-d88680d1-26f2-4863-be95-83298fd01e02)
1104-
![Sony](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/sony-4.png)
1105-
1106-
![Vodafone](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/vodafone-5.png)
1107-
![British Airways](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/british-airways-5.png)
1108-
![McDonalds](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/mcdonalds-6.png)
1109-
![EA](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/ea-6.png)
1110-
![Vogue](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/vogue-6.png)
1111-
![Mi](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/mi-6.png)
1112-
1113-
![Mercedes](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/mercedes-5.png)
1114-
![sym](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/sym-5.png)
1115-
![Bugatti](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/bugatti-5.png)
1116-
![eDarling](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/edarling-5.png)
1117-
![Ubisoft](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/ubisoft-5.png)
1100+
![Who is using fullPage.js](https://cdn.jsdelivr.net/gh/alvarotrigo/fullpage-assets/imgs/using-fullpage.png)
11181101

11191102
- http://www.bbc.co.uk/news/resources/idt-d88680d1-26f2-4863-be95-83298fd01e02
11201103
- http://medoff.ua/en/
@@ -1148,5 +1131,5 @@ Become a sponsor and get your logo on our README on Github with a link to your s
11481131
## Contributors
11491132

11501133
<a href="https://github.com/alvarotrigo/fullPage.js/graphs/contributors">
1151-
<img src="https://contrib.rocks/image?repo=alvarotrigo/fullPage.js&max=400&columns=25&anon=1" />
1134+
<img src="https://contrib.rocks/image?repo=alvarotrigo/fullPage.js&max=400&columns=25&anon=1&v=2" />
11521135
</a>

‎lang/french/README.md‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,24 +1118,7 @@ Vous voulez créer des fichiers de distribution fullpage.js ? Veuillez consulter
11181118

11191119
## Qui utilise fullPage.js
11201120

1121-
[![Google](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/google-4.png)](http://www.yourprimer.com/)
1122-
![Coca-cola](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/cocacola-4.png)
1123-
![eBay](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/ebay-4.png)
1124-
[![BBC](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/bbc-4.png)](http://www.bbc.co.uk/news/resources/idt-d88680d1-26f2-4863-be95-83298fd01e02)
1125-
![Sony](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/sony-4.png)
1126-
1127-
![Vodafone](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/vodafone-5.png)
1128-
![British Airways](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/british-airways-5.png)
1129-
![McDonalds](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/mcdonalds-6.png)
1130-
![EA](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/ea-6.png)
1131-
![Vogue](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/vogue-6.png)
1132-
![Mi](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/mi-6.png)
1133-
1134-
![Mercedes](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/mercedes-5.png)
1135-
![sym](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/sym-5.png)
1136-
![Bugatti](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/bugatti-5.png)
1137-
![eDarling](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/edarling-5.png)
1138-
![Ubisoft](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/ubisoft-5.png)
1121+
![Who is using fullPage.js](https://cdn.jsdelivr.net/gh/alvarotrigo/fullpage-assets/imgs/using-fullpage.png)
11391122

11401123
- http://www.bbc.co.uk/news/resources/idt-d88680d1-26f2-4863-be95-83298fd01e02
11411124
- http://medoff.ua/en/
@@ -1166,5 +1149,5 @@ Devenez sponsor et obtenez votre logo sur notre README sur Github avec un lien v
11661149
## Contributors
11671150

11681151
<a href="https://github.com/alvarotrigo/fullPage.js/graphs/contributors">
1169-
<img src="https://contrib.rocks/image?repo=alvarotrigo/fullPage.js&max=400&columns=25&anon=1" />
1152+
<img src="https://contrib.rocks/image?repo=alvarotrigo/fullPage.js&max=400&columns=25&anon=1&v=2" />
11701153
</a>

0 commit comments

Comments
 (0)