FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge pull request #3814 from alvarotrigo/dev · javascriptit/fullPage.js@ca7c432 · GitHub

  1. javascriptit
  2. fullPage.js

Repository navigation

Commit ca7c432

Browse files
alvarotrigo
authored
Merge pull request alvarotrigo#3814 from alvarotrigo/dev
Merging dev branch 3.0.8
2 parents fe7ff78 + 9719c29 commit ca7c432

32 files changed

Lines changed: 1499 additions & 401 deletions

‎README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
---
1818

19-
![fullPage.js version](http://img.shields.io/badge/fullPage.js-v3.0.7-brightgreen.svg)
19+
![fullPage.js version](http://img.shields.io/badge/fullPage.js-v3.0.8-brightgreen.svg)
2020
[![License](https://img.shields.io/badge/License-GPL-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
2121
[![PayPal Donate](https://img.shields.io/badge/donate-PayPal.me-ff69b4.svg)](https://www.paypal.me/alvarotrigo/9.95)
2222
[![jsDelivr Hits](https://data.jsdelivr.com/v1/package/npm/fullpage.js/badge?style=rounded)](https://www.jsdelivr.com/package/npm/fullpage.js)
@@ -30,8 +30,7 @@
3030

3131
---
3232

33-
A simple and easy to use library to create fullscreen scrolling websites (also known as single page websites or onepage sites).
34-
It allows the creation of fullscreen scrolling websites, as well as adding some landscape sliders inside the sections of the site.
33+
A simple and easy to use library that creates fullscreen scrolling websites (also known as single page websites or onepage sites) and adds landscape sliders inside the sections of the site.
3534

3635
- [Introduction](https://github.com/alvarotrigo/fullPage.js#introduction)
3736
- [Compatibility](https://github.com/alvarotrigo/fullPage.js#compatibility)
@@ -979,6 +978,8 @@ Want to build fullpage.js distribution files? Please see [Build Tasks](https://g
979978
- [fullPage.js Rails Ruby Gem](https://rubygems.org/gems/fullpagejs-rails)
980979
- [Angular fullPage.js - Adaptation for Angular.js v1.x](https://github.com/mmautomatizacion/angular-fullpage.js)
981980
- [Integrating fullPage.js with Wordpress (Tutorial)](http://premium.wpmudev.org/blog/build-apple-inspired-full-page-scrolling-pages-for-your-wordpress-site/)
981+
- [Wordpress Plugin for Divi](https://alvarotrigo.com/fullPage/wordpress-plugin-divi/)
982+
- [Wordpress Plugin for Elementor](https://alvarotrigo.com/fullPage/wordpress-plugin-elementor/)
982983

983984
## Who is using fullPage.js
984985
If you want your page to be listed here, please <a href="mailto:alvaro@alvarotrigo.com">contact me</a> with the URL.

‎dist/fullpage.css‎

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

‎dist/fullpage.extensions.min.js‎

100644100755
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: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* fullPage 3.0.7
2+
* fullPage 3.0.8
33
* https://github.com/alvarotrigo/fullPage.js
44
*
55
* @license GPLv3 for open source use only
@@ -586,7 +586,7 @@
586586

587587
if(container){
588588
//public functions
589-
FP.version = '3.0.5';
589+
FP.version = '3.0.8';
590590
FP.setAutoScrolling = setAutoScrolling;
591591
FP.setRecordHistory = setRecordHistory;
592592
FP.setScrollingSpeed = setScrollingSpeed;
@@ -604,7 +604,7 @@
604604
FP.fitToSection = fitToSection;
605605
FP.reBuild = reBuild;
606606
FP.setResponsive = setResponsive;
607-
FP.getFullpageData = function(){ return options };
607+
FP.getFullpageData = function(){ return options; };
608608
FP.destroy = destroy;
609609
FP.getActiveSection = getActiveSection;
610610
FP.getActiveSlide = getActiveSlide;
@@ -751,15 +751,20 @@
751751
}
752752

753753
function onMouseEnterOrLeave(e) {
754-
//onMouseLeave will use the destination target, not the one we are moving away from
755-
var target = event.toElement || e.relatedTarget || e.target;
756-
757754
var type = e.type;
758755
var isInsideOneNormalScroll = false;
756+
var isUsingScrollOverflow = options.scrollOverflow;
757+
758+
//onMouseLeave will use the destination target, not the one we are moving away from
759+
var target = type === 'mouseleave' ? e.toElement || e.relatedTarget : e.target;
759760

760761
//coming from closing a normalScrollElements modal or moving outside viewport?
761762
if(target == document || !target){
762763
setMouseHijack(true);
764+
765+
if(isUsingScrollOverflow){
766+
options.scrollOverflowHandler.setIscroll(target, true);
767+
}
763768
return;
764769
}
765770

@@ -788,6 +793,10 @@
788793
if(isNormalScrollTarget || isNormalScrollChildFocused){
789794
if(!FP.shared.isNormalScrollElement){
790795
setMouseHijack(false);
796+
797+
if(isUsingScrollOverflow){
798+
options.scrollOverflowHandler.setIscroll(target, false);
799+
}
791800
}
792801
FP.shared.isNormalScrollElement = true;
793802
isInsideOneNormalScroll = true;
@@ -798,6 +807,11 @@
798807
//not inside a single normal scroll element anymore?
799808
if(!isInsideOneNormalScroll && FP.shared.isNormalScrollElement){
800809
setMouseHijack(true);
810+
811+
if(isUsingScrollOverflow){
812+
options.scrollOverflowHandler.setIscroll(target, true);
813+
}
814+
801815
FP.shared.isNormalScrollElement = false;
802816
}
803817
}
@@ -833,8 +847,8 @@
833847

834848
//no anchors option? Checking for them in the DOM attributes
835849
if(!options.anchors.length){
836-
var attrName = '[data-anchor]';
837-
var anchors = $(options.sectionSelector.split(',').join(attrName + ',') + attrName, container);
850+
var anchorsAttribute = '[data-anchor]';
851+
var anchors = $(options.sectionSelector.split(',').join(anchorsAttribute + ',') + anchorsAttribute, container);
838852
if(anchors.length){
839853
g_initialAnchorsInDom = true;
840854
anchors.forEach(function(item){
@@ -845,8 +859,8 @@
845859

846860
//no tooltips option? Checking for them in the DOM attributes
847861
if(!options.navigationTooltips.length){
848-
var attrName = '[data-tooltip]';
849-
var tooltips = $(options.sectionSelector.split(',').join(attrName + ',') + attrName, container);
862+
var tooltipsAttribute = '[data-tooltip]';
863+
var tooltips = $(options.sectionSelector.split(',').join(tooltipsAttribute + ',') + tooltipsAttribute, container);
850864
if(tooltips.length){
851865
tooltips.forEach(function(item){
852866
options.navigationTooltips.push(item.getAttribute('data-tooltip').toString());
@@ -1094,7 +1108,7 @@
10941108
function getBulletLinkName(i, defaultName){
10951109
return options.navigationTooltips[i]
10961110
|| options.anchors[i]
1097-
|| defaultName + ' ' + (i+1)
1111+
|| defaultName + ' ' + (i+1);
10981112
}
10991113

11001114
/*
@@ -2052,7 +2066,7 @@
20522066
elementToPlay.load();
20532067
elementToPlay.onloadeddata = function(){
20542068
onMediaLoad(destiny);
2055-
}
2069+
};
20562070
}
20572071
}
20582072
});
@@ -2384,6 +2398,7 @@
23842398
function menuItemsHandler(e){
23852399
if($(options.menu)[0] && (options.lockAnchors || !options.anchors.length)){
23862400
preventDefault(e);
2401+
/*jshint validthis:true */
23872402
moveTo(this.getAttribute('data-menuanchor'));
23882403
}
23892404
}
@@ -3013,7 +3028,7 @@
30133028
};
30143029

30153030
//preventing the style p:empty{display: none;} from returning the wrong result
3016-
el.style.display = 'block'
3031+
el.style.display = 'block';
30173032

30183033
// Add it to the body to get the computed style.
30193034
document.body.insertBefore(el, null);
@@ -3399,7 +3414,7 @@
33993414
*/
34003415
function displayWarnings(){
34013416
var l = options['li' + 'c' + 'enseK' + 'e' + 'y'];
3402-
var msgStyle = 'font-size: 15px;background:yellow;'
3417+
var msgStyle = 'font-size: 15px;background:yellow;';
34033418

34043419
if(!isOK){
34053420
showError('error', 'Fullpage.js version 3 has changed its license to GPLv3 and it requires a `licenseKey` option. Read about it here:');
@@ -4180,7 +4195,7 @@ if(window.jQuery && window.fullpage){
41804195

41814196
$.fn.fullpage = function(options) {
41824197
options = $.extend({}, options, {'$': $});
4183-
new fullpage(this[0], options);
4198+
var instance = new fullpage(this[0], options);
41844199
};
41854200
})(window.jQuery, window.fullpage);
41864201
}

‎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.

‎dist/fullpage.min.js.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.

‎examples/angular-fullpage.html‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<!DOCTYPE html>
2+
<html xmlns="http://www.w3.org/1999/xhtml">
3+
4+
<head>
5+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
6+
<title>Vue-fullpage - fullPage.js</title>
7+
<meta name="author" content="Alvaro Trigo Lopez" />
8+
<meta name="description" content="fullPage auto-height example." />
9+
<meta name="keywords" content="fullpage,jquery,demo,screen,fullscreen,auto-height,full-screen" />
10+
<meta name="Resource-type" content="Document" />
11+
<meta http-equiv="refresh" content="0; url=http://alvarotrigo.com/angular-fullpage/" />
12+
</head>
13+
<body>
14+
15+
Redirecting...
16+
17+
</body>
18+
</html>

‎examples/bug-3488.html‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL