Skip to content

Commit

Permalink
Merge pull request #3188 from alvarotrigo/dev
Browse files Browse the repository at this point in the history
Merging dev branch 2.9.7
  • Loading branch information
alvarotrigo authored Apr 9, 2018
2 parents c0019fb + 215a433 commit 7104721
Show file tree
Hide file tree
Showing 44 changed files with 9,286 additions and 889 deletions.
14 changes: 9 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

<p align="center">
<span>English</span> |
<a href="https://github.com/alvarotrigo/fullPage.js/tree/master/lang/spanish#fullpagejs">Spanish</a> |
<a href="https://github.com/alvarotrigo/fullPage.js/tree/master/lang/russian#fullpagejs">Russian</a> |
<a href="https://github.com/alvarotrigo/fullPage.js/tree/master/lang/chinese#fullpagejs">Chinese</a> |
<a href="https://github.com/alvarotrigo/fullPage.js/tree/master/lang/korean#fullpagejs">Korean</a>
<a href="https://github.com/alvarotrigo/fullPage.js/tree/master/lang/spanish#fullpagejs">Español</a> |
<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>
</p>

---

![fullPage.js version](http://img.shields.io/badge/fullPage.js-v2.9.6-brightgreen.svg)
![fullPage.js version](http://img.shields.io/badge/fullPage.js-v2.9.7-brightgreen.svg)
[![License](http://img.shields.io/badge/License-MIT-blue.svg)](http://opensource.org/licenses/MIT)
[![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 @@ -52,6 +52,7 @@ Customizations of the library and urgent changes are available upon request for
- [Resources](https://github.com/alvarotrigo/fullPage.js#resources)
- [Who is using fullpage.js](https://github.com/alvarotrigo/fullPage.js#who-is-using-fullpagejs)
- [Donations](https://github.com/alvarotrigo/fullPage.js#donations)
- [Sponsors](https://github.com/alvarotrigo/fullPage.js#sponsors)
- [License](https://github.com/alvarotrigo/fullPage.js#license)

## Introduction
Expand Down Expand Up @@ -968,6 +969,9 @@ Donations would be more than welcome :)

[![Donate](https://www.paypalobjects.com/en_US/GB/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=BEK5JQCQMED4J&lc=GB&item_name=fullPage%2ejs&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted)

## Sponsors
[![Stackpath](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/stackpath2.png)](https://www.stackpath.com/)
[![Browserstack](http://wallpapers-for-ipad.com/fullpage/imgs3/logos/browserstack2.png)](http://www.browserstack.com/)

## License

Expand Down
2 changes: 1 addition & 1 deletion dist/jquery.fullpage.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* fullPage 2.9.6
* fullPage 2.9.7
* https://github.com/alvarotrigo/fullPage.js
* MIT licensed
*
Expand Down
5 changes: 2 additions & 3 deletions dist/jquery.fullpage.extensions.min.js

Large diffs are not rendered by default.

22 changes: 16 additions & 6 deletions dist/jquery.fullpage.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* fullPage 2.9.6
* fullPage 2.9.7
* https://github.com/alvarotrigo/fullPage.js
* @license MIT licensed
*
Expand Down Expand Up @@ -507,7 +507,7 @@

if($(this).length){
//public functions
FP.version = '2.9.5';
FP.version = '2.9.6';
FP.setAutoScrolling = setAutoScrolling;
FP.setRecordHistory = setRecordHistory;
FP.setScrollingSpeed = setScrollingSpeed;
Expand Down Expand Up @@ -1393,7 +1393,14 @@

//callback (onLeave) if the site is not just resizing and readjusting the slides
if($.isFunction(options.onLeave) && !v.localIsResizing){
if(options.onLeave.call(v.activeSection, v.leavingSection, (v.sectionIndex + 1), v.yMovement) === false){
var direction = v.yMovement;

//required for continousVertical
if(typeof isMovementUp !== 'undefined'){
direction = isMovementUp ? 'up' : 'down';
}

if(options.onLeave.call(v.activeSection, v.leavingSection, (v.sectionIndex + 1), direction) === false){
return;
}
}
Expand Down Expand Up @@ -1731,7 +1738,7 @@
var isFirstSlideMove = (typeof lastScrolledDestiny === 'undefined');
var isFirstScrollMove = (typeof lastScrolledDestiny === 'undefined' && typeof slideAnchor === 'undefined' && !slideMoving);

if(sectionAnchor.length){
if(sectionAnchor && sectionAnchor.length){
/*in order to call scrollpage() only once for each destination at a time
It is called twice for each scroll otherwise, as in case of using anchorlinks `hashChange`
event is fired on every scroll too.*/
Expand Down Expand Up @@ -1946,7 +1953,7 @@
var activeSection = $(SECTION_ACTIVE_SEL);
var activeSlide = activeSection.find(SLIDE_ACTIVE_SEL);
var focusableWrapper = activeSlide.length ? activeSlide : activeSection;
var focusableElements = focusableWrapper.find(focusableElementsString);
var focusableElements = focusableWrapper.find(focusableElementsString).not('[tabindex="-1"]');

function preventAndFocusFirst(e){
e.preventDefault();
Expand Down Expand Up @@ -2254,7 +2261,8 @@
function addTableClass(element){
//In case we are styling for the 2nd time as in with reponsiveSlides
if(!element.hasClass(TABLE)){
element.addClass(TABLE).wrapInner('<div class="' + TABLE_CELL + '" style="height:' + getTableHeight(element) + 'px;" />');
var wrapper = $('<div class="' + TABLE_CELL + '" />').height(getTableHeight(element));
element.addClass(TABLE).wrapInner(wrapper);
}
}

Expand Down Expand Up @@ -2724,6 +2732,8 @@
.off('resize', resizeHandler);

$document
.off('keydown', keydownHandler)
.off('keyup', keyUpHandler)
.off('click touchstart', SECTION_NAV_SEL + ' a')
.off('mouseenter', SECTION_NAV_SEL + ' li')
.off('mouseleave', SECTION_NAV_SEL + ' li')
Expand Down
2 changes: 1 addition & 1 deletion dist/jquery.fullpage.min.css

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

Loading

0 comments on commit 7104721

Please sign in to comment.