Skip to content

Commit 87c7b66

Browse files
alvarotrigoalvarotrigo
committed
Merging dev branch
2 parents 88feaaa + 4c761d7 commit 87c7b66

13 files changed

+45
-37
lines changed

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
![preview](https://raw.github.com/alvarotrigo/fullPage.js/master/examples/imgs/intro.png)
44
![compatibility](https://raw.github.com/alvarotrigo/fullPage.js/master/examples/imgs/compatible.gif)
55

6-
![fullPage.js version](http://img.shields.io/badge/fullPage.js-v2.8.0-brightgreen.svg)
6+
![fullPage.js version](http://img.shields.io/badge/fullPage.js-v2.8.1-brightgreen.svg)
77
[![License](http://img.shields.io/badge/License-MIT-blue.svg)](http://opensource.org/licenses/MIT)
88
7Kb gziped!
99

@@ -753,6 +753,7 @@ Want to build fullpage.js distribution files? Please see [Build Tasks](https://g
753753
- [fullPage.js jsDelivr CDN](http://www.jsdelivr.com/#!jquery.fullpage)
754754
- [fullPage.js plugin for October CMS](http://octobercms.com/plugin/freestream-parallax)
755755
- [fullPage.js wordpress plugin](https://wordpress.org/plugins/wp-fullpage/)
756+
- [fullPage.js Angular2 directive](https://github.com/meiblorn/ng2-fullpage)
756757
- [fullPage.js angular directive](https://github.com/hellsan631/angular-fullpage.js)
757758
- [Angular fullPage.js - Adaptation for Angular.js v1.x](https://github.com/mmautomatizacion/angular-fullpage.js)
758759
- [Integrating fullPage.js with Wordpress (Tutorial)](http://premium.wpmudev.org/blog/build-apple-inspired-full-page-scrolling-pages-for-your-wordpress-site/)

‎dist/jquery.fullpage.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* fullPage 2.8.0
2+
* fullPage 2.8.1
33
* https://github.com/alvarotrigo/fullPage.js
44
* MIT licensed
55
*

‎dist/jquery.fullpage.js

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* fullPage 2.8.0
2+
* fullPage 2.8.1
33
* https://github.com/alvarotrigo/fullPage.js
44
* @license MIT licensed
55
*
@@ -94,7 +94,10 @@
9494
mouseWheel: true,
9595
hideScrollbars: false,
9696
fadeScrollbars: false,
97-
disableMouse: true
97+
disableMouse: true,
98+
99+
//fixing bug in iScroll with links: https://github.com/cubiq/iscroll/issues/783
100+
click: true
98101
};
99102

100103
$.fn.fullpage = function(options) {
@@ -1615,8 +1618,8 @@
16151618
function scrollToAnchor(){
16161619
//getting the anchor link in the URL and deleting the `#`
16171620
var value = window.location.hash.replace('#', '').split('/');
1618-
var section = value[0];
1619-
var slide = value[1];
1621+
var section = decodeURIComponent(value[0]);
1622+
var slide = decodeURIComponent(value[1]);
16201623

16211624
if(section){ //if theres any #
16221625
if(options.animateAnchor){
@@ -1634,8 +1637,8 @@
16341637
function hashChangeHandler(){
16351638
if(!isScrolling && !options.lockAnchors){
16361639
var value = window.location.hash.replace('#', '').split('/');
1637-
var section = value[0];
1638-
var slide = value[1];
1640+
var section = decodeURIComponent(value[0]);
1641+
var slide = decodeURIComponent(value[1]);
16391642

16401643
//when moving to a slide in the first section for the first time (first time to add an anchor to the URL)
16411644
var isFirstSlideMove = (typeof lastScrolledDestiny === 'undefined');
@@ -2763,15 +2766,16 @@
27632766
*/
27642767
onLeave: function(){
27652768
var scroller = $(SECTION_ACTIVE_SEL).find(SCROLLABLE_SEL).data('iscrollInstance');
2766-
if(typeof scroller !== 'undefined'){
2769+
2770+
if(typeof scroller !== 'undefined' && scroller){
27672771
scroller.wheelOff();
27682772
}
27692773
},
27702774

27712775
// Turns on iScroll on section load
27722776
afterLoad: function(){
27732777
var scroller = $(SECTION_ACTIVE_SEL).find(SCROLLABLE_SEL).data('iscrollInstance');
2774-
if(typeof scroller !== 'undefined'){
2778+
if(typeof scroller !== 'undefined' && scroller){
27752779
scroller.wheelOn();
27762780
}
27772781
},
@@ -2860,7 +2864,7 @@
28602864
var iScrollInstance = scrollable.data('iscrollInstance');
28612865
iScrollInstance.destroy();
28622866

2863-
scrollable.data( 'iscrollInstance', undefined );
2867+
scrollable.data('iscrollInstance', 'undefined');
28642868
}
28652869
element.find(SCROLLABLE_SEL).children().first().children().first().unwrap().unwrap();
28662870
},
@@ -2899,4 +2903,4 @@
28992903
}
29002904
};
29012905

2902-
});
2906+
});

‎dist/jquery.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/jquery.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/jquery.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/jquery.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.

‎gulpfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var rename = require('gulp-rename');
33
var sourcemaps = require('gulp-sourcemaps');
44
var uglify = require('gulp-uglify');
55
var sass = require('gulp-sass');
6-
var minifyCss = require('gulp-minify-css');
6+
var minifyCss = require('gulp-clean-css');
77

88
gulp.task('sass', function() {
99
gulp.src('./jquery.fullpage.scss')
@@ -23,7 +23,7 @@ gulp.task('css', function() {
2323
keepSpecialComments: '1'
2424
}))
2525
.pipe(rename({suffix: '.min'}))
26-
.pipe(sourcemaps.write('.'))
26+
.pipe(sourcemaps.write('.'))
2727
.pipe(gulp.dest('./dist'));
2828
});
2929

‎jquery.fullPage.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* fullPage 2.8.0
2+
* fullPage 2.8.1
33
* https://github.com/alvarotrigo/fullPage.js
44
* MIT licensed
55
*

0 commit comments

Comments
 (0)