Merge pull request alvarotrigo#3814 from alvarotrigo/dev

Merging dev branch 3.0.8
ngalmes · Nov 25, 2019 · ca7c432 · ca7c432
2 parents fe7ff78 + 9719c29
commit ca7c432
Show file tree

Hide file tree

Showing 32 changed files with 1,499 additions and 401 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@
 
 ---
 
-![fullPage.js version](http://img.shields.io/badge/fullPage.js-v3.0.7-brightgreen.svg)
+![fullPage.js version](http://img.shields.io/badge/fullPage.js-v3.0.8-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)
@@ -30,8 +30,7 @@
 
 ---
 
-A simple and easy to use library to create fullscreen scrolling websites (also known as single page websites or onepage sites).
-It allows the creation of fullscreen scrolling websites, as well as adding some landscape sliders inside the sections of the site.
+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.
 
 - [Introduction](https://github.com/alvarotrigo/fullPage.js#introduction)
 - [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
 - [fullPage.js Rails Ruby Gem](https://rubygems.org/gems/fullpagejs-rails)
 - [Angular fullPage.js - Adaptation for Angular.js v1.x](https://github.com/mmautomatizacion/angular-fullpage.js)
 - [Integrating fullPage.js with Wordpress (Tutorial)](http://premium.wpmudev.org/blog/build-apple-inspired-full-page-scrolling-pages-for-your-wordpress-site/)
+- [Wordpress Plugin for Divi](https://alvarotrigo.com/fullPage/wordpress-plugin-divi/)
+- [Wordpress Plugin for Elementor](https://alvarotrigo.com/fullPage/wordpress-plugin-elementor/)
 
 ## Who is using fullPage.js
 If you want your page to be listed here, please <a href="mailto:alvaro@alvarotrigo.com">contact me</a> with the URL.

diff --git a/dist/fullpage.css b/dist/fullpage.css
@@ -1,5 +1,5 @@
 /*!
- * fullPage 3.0.7
+ * fullPage 3.0.8
  * https://github.com/alvarotrigo/fullPage.js
  *
  * @license GPLv3 for open source use only

diff --git a/dist/fullpage.extensions.min.js b/dist/fullpage.extensions.min.js
diff --git a/dist/fullpage.js b/dist/fullpage.js
@@ -1,5 +1,5 @@
 /*!
- * fullPage 3.0.7
+ * fullPage 3.0.8
  * https://github.com/alvarotrigo/fullPage.js
  *
  * @license GPLv3 for open source use only
@@ -586,7 +586,7 @@
 
         if(container){
             //public functions
-            FP.version = '3.0.5';
+            FP.version = '3.0.8';
             FP.setAutoScrolling = setAutoScrolling;
             FP.setRecordHistory = setRecordHistory;
             FP.setScrollingSpeed = setScrollingSpeed;
@@ -604,7 +604,7 @@
             FP.fitToSection = fitToSection;
             FP.reBuild = reBuild;
             FP.setResponsive = setResponsive;
-            FP.getFullpageData = function(){ return options };
+            FP.getFullpageData = function(){ return options; };
             FP.destroy = destroy;
             FP.getActiveSection = getActiveSection;
             FP.getActiveSlide = getActiveSlide;
@@ -751,15 +751,20 @@
         }
 
         function onMouseEnterOrLeave(e) {
-            //onMouseLeave will use the destination target, not the one we are moving away from
-            var target = event.toElement || e.relatedTarget || e.target;
-
             var type = e.type;
             var isInsideOneNormalScroll = false;
+            var isUsingScrollOverflow = options.scrollOverflow;
+
+            //onMouseLeave will use the destination target, not the one we are moving away from
+            var target = type === 'mouseleave' ? e.toElement || e.relatedTarget : e.target;
 
             //coming from closing a normalScrollElements modal or moving outside viewport?
             if(target == document || !target){
                 setMouseHijack(true);
+
+                if(isUsingScrollOverflow){
+                    options.scrollOverflowHandler.setIscroll(target, true);
+                }
                 return;
             }
 
@@ -788,6 +793,10 @@
                     if(isNormalScrollTarget || isNormalScrollChildFocused){
                         if(!FP.shared.isNormalScrollElement){
                             setMouseHijack(false);
+
+                            if(isUsingScrollOverflow){
+                                options.scrollOverflowHandler.setIscroll(target, false);
+                            }
                         }
                         FP.shared.isNormalScrollElement = true;
                         isInsideOneNormalScroll = true;
@@ -798,6 +807,11 @@
             //not inside a single normal scroll element anymore?
             if(!isInsideOneNormalScroll && FP.shared.isNormalScrollElement){
                 setMouseHijack(true);
+
+                if(isUsingScrollOverflow){
+                    options.scrollOverflowHandler.setIscroll(target, true);
+                }
+
                 FP.shared.isNormalScrollElement = false;
             }
         }
@@ -833,8 +847,8 @@
 
             //no anchors option? Checking for them in the DOM attributes
             if(!options.anchors.length){
-                var attrName = '[data-anchor]';
-                var anchors = $(options.sectionSelector.split(',').join(attrName + ',') + attrName, container);
+                var anchorsAttribute = '[data-anchor]';
+                var anchors = $(options.sectionSelector.split(',').join(anchorsAttribute + ',') + anchorsAttribute, container);
                 if(anchors.length){
                     g_initialAnchorsInDom = true;
                     anchors.forEach(function(item){
@@ -845,8 +859,8 @@
 
             //no tooltips option? Checking for them in the DOM attributes
             if(!options.navigationTooltips.length){
-                var attrName = '[data-tooltip]';
-                var tooltips = $(options.sectionSelector.split(',').join(attrName + ',') + attrName, container);
+                var tooltipsAttribute = '[data-tooltip]';
+                var tooltips = $(options.sectionSelector.split(',').join(tooltipsAttribute + ',') + tooltipsAttribute, container);
                 if(tooltips.length){
                     tooltips.forEach(function(item){
                         options.navigationTooltips.push(item.getAttribute('data-tooltip').toString());
@@ -1094,7 +1108,7 @@
         function getBulletLinkName(i, defaultName){
             return options.navigationTooltips[i]
                 || options.anchors[i]
-                || defaultName + ' ' + (i+1)
+                || defaultName + ' ' + (i+1);
         }
 
         /*
@@ -2052,7 +2066,7 @@
                         elementToPlay.load();
                         elementToPlay.onloadeddata = function(){
                             onMediaLoad(destiny);
-                        }
+                        };
                     }
                 }
             });
@@ -2384,6 +2398,7 @@
         function menuItemsHandler(e){
             if($(options.menu)[0] && (options.lockAnchors || !options.anchors.length)){
                 preventDefault(e);
+                /*jshint validthis:true */
                 moveTo(this.getAttribute('data-menuanchor'));
             }
         }
@@ -3013,7 +3028,7 @@
                 };
 
             //preventing the style p:empty{display: none;} from returning the wrong result
-            el.style.display = 'block'
+            el.style.display = 'block';
 
             // Add it to the body to get the computed style.
             document.body.insertBefore(el, null);
@@ -3399,7 +3414,7 @@
         */
         function displayWarnings(){
             var l = options['li' + 'c' + 'enseK' + 'e' + 'y'];
-            var msgStyle = 'font-size: 15px;background:yellow;'
+            var msgStyle = 'font-size: 15px;background:yellow;';
 
             if(!isOK){
                 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){
 
         $.fn.fullpage = function(options) {
             options = $.extend({}, options, {'$': $});
-            new fullpage(this[0], options);
+            var instance = new fullpage(this[0], options);
         };
     })(window.jQuery, window.fullpage);
 }
diff --git a/dist/fullpage.min.css b/dist/fullpage.min.css
diff --git a/dist/fullpage.min.css.map b/dist/fullpage.min.css.map
diff --git a/dist/fullpage.min.js b/dist/fullpage.min.js
diff --git a/dist/fullpage.min.js.map b/dist/fullpage.min.js.map
diff --git a/examples/angular-fullpage.html b/examples/angular-fullpage.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Vue-fullpage - fullPage.js</title>
+    <meta name="author" content="Alvaro Trigo Lopez" />
+    <meta name="description" content="fullPage auto-height example." />
+    <meta name="keywords"  content="fullpage,jquery,demo,screen,fullscreen,auto-height,full-screen" />
+    <meta name="Resource-type" content="Document" />
+    <meta http-equiv="refresh" content="0; url=http://alvarotrigo.com/angular-fullpage/" />
+</head>
+<body>
+
+Redirecting...
+
+</body>
+</html>
diff --git a/examples/bug-3488.html b/examples/bug-3488.html
diff --git a/examples/react-fullpage.html b/examples/react-fullpage.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Vue-fullpage - fullPage.js</title>
+    <meta name="author" content="Alvaro Trigo Lopez" />
+    <meta name="description" content="fullPage auto-height example." />
+    <meta name="keywords"  content="fullpage,jquery,demo,screen,fullscreen,auto-height,full-screen" />
+    <meta name="Resource-type" content="Document" />
+    <meta http-equiv="refresh" content="0; url=http://alvarotrigo.com/react-fullpage/" />
+</head>
+<body>
+
+Redirecting...
+
+</body>
+</html>
diff --git a/gulpfile.js b/gulpfile.js
@@ -58,6 +58,9 @@ gulp.task('extensions', function(done) {
         .pipe(uglify({
             output: {
                 comments: 'some'
+            },
+            compress: {
+                pure_funcs: [ 'console.log' ]
             }
         }))
         .pipe(rename({suffix: '.min'}))