Merge pull request #4641 from alvarotrigo/dev

Merging dev branch 4.0.26

.github/ISSUE_TEMPLATE.md

@@ -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]

README.md

@@ -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>
 
@@ -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)
@@ -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" />
 
@@ -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:
@@ -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
@@ -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', {

dist/fullpage.css

@@ -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
@@ -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;
@@ -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;
@@ -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,

dist/fullpage.js

@@ -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
@@ -979,7 +979,8 @@
       isDoingContinousVertical: false,
       timeouts: {},
       scrollY: 0,
-      scrollX: 0
+      scrollX: 0,
+      isFullpageInitDone: false
     }; // @ts-ignore
 
     win.state = state;
@@ -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({
@@ -4656,7 +4657,6 @@
 
 
       if (!getIsScrollAllowed().m.down && !getIsScrollAllowed().m.up) {
-        preventDefault(e);
         return false;
       }
 
@@ -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    
 
@@ -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"];
 
@@ -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);
       }
 
@@ -5922,8 +5929,11 @@
         EventEmitter.emit(events.beforeInit);
         init();
         EventEmitter.emit(events.bindEvents);
-      } // @ts-ignore
+      }
 
+      setState({
+        isFullpageInitDone: true
+      }); // @ts-ignore
 
       return win.fullpage_api;
     }
@@ -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)',