Skip to content

Commit 3e33e65

Browse files
alvarotrigoalvarotrigo
authored
Merge pull request alvarotrigo#2456 from alvarotrigo/dev
Merging dev branch 2.9.0
2 parents 52f68a9 + e23e1f4 commit 3e33e65

21 files changed

+341
-112
lines changed

‎README.md

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,20 @@
77
<a href="https://github.com/alvarotrigo/fullPage.js"><img src="https://raw.githubusercontent.com/alvarotrigo/fullPage.js/dev/examples/imgs/en-language.png" /></a><a href="https://github.com/alvarotrigo/fullPage.js/blob/dev/README_SPANISH.md#fullpagejs"><img src="https://raw.githubusercontent.com/alvarotrigo/fullPage.js/dev/examples/imgs/es-language-inactive.png" /></a>
88
</p>
99

10-
![fullPage.js version](http://img.shields.io/badge/fullPage.js-v2.8.9-brightgreen.svg)
10+
<p align="center">
11+
<a href="http://alvarotrigo.com/fullPage/utils/wordpress-y-theme.html"><img src="http://alvarotrigo.com/fullPage/imgs/wodpress-y-theme-fullpage1.png" /></a>
12+
</p>
13+
14+
![fullPage.js version](http://img.shields.io/badge/fullPage.js-v2.9.0-brightgreen.svg)
1115
[![License](http://img.shields.io/badge/License-MIT-blue.svg)](http://opensource.org/licenses/MIT)
1216
7Kb gziped!
1317

1418
A simple and easy to use plugin to create fullscreen scrolling websites (also known as single page websites or onepage sites).
1519
It allows the creation of fullscreen scrolling websites, as well as adding some landscape sliders inside the sections of the site.
1620

1721
- [Live demo](http://alvarotrigo.com/fullPage/)
18-
- [Wordpress theme](https://goo.gl/HuFudq)
22+
- [Wordpress theme 1](http://alvarotrigo.com/fullPage/utils/wordpress-y-theme.html)
23+
- [Wordpress theme 2](http://alvarotrigo.com/fullPage/utils/wordpress.html)
1924
- [fullpage.js Extensions](http://alvarotrigo.com/fullPage/extensions/)
2025
- [Frequently Answered Questions](https://github.com/alvarotrigo/fullPage.js/wiki/FAQ---Frequently-Answered-Questions)
2126

@@ -152,7 +157,7 @@ $(document).ready(function() {
152157
navigationPosition: 'right',
153158
navigationTooltips: ['firstSlide', 'secondSlide'],
154159
showActiveTooltip: false,
155-
slidesNavigation: true,
160+
slidesNavigation: false,
156161
slidesNavPosition: 'bottom',
157162

158163
//Scrolling
@@ -315,15 +320,16 @@ Embedded HTML5 `<video>` / `<audio>` and Youtube iframes are automatically paus
315320
###Use extensions
316321
fullpage.js [provides a set of extensions](http://alvarotrigo.com/fullPage/extensions/) you can use to enhance its default features. All of them are listed as [fullpage.js options](https://github.com/alvarotrigo/fullPage.js#options).
317322

318-
Extensions requires you to use the minified file `jquery.fullpage.extensions.min.js` instead of the usual fullPage.js file (`jquery.fullpage.js`).
319-
Once you adquire the extension file, you will need to add it before fullPage.js. For example:
323+
Extensions requires you to use the minified file [`jquery.fullpage.extensions.min.js`](https://github.com/alvarotrigo/fullPage.js/blob/master/dist/jquery.fullpage.extensions.min.js) that is inside the [`dist` folder](https://github.com/alvarotrigo/fullPage.js/tree/master/dist) instead of the usual fullPage.js file (`jquery.fullpage.js` or `jquery.fullpage.min.js`).
324+
325+
Once you adquire the extension file, you will need to add it before fullPage. For example, if I want to use the Continuos Horizontal extension, I would have include the extension file and then the extensions version of the fullPage file.
320326

321327
```html
322328
<script type="text/javascript" src="fullpage.continuousHorizontal.min.js"></script>
323329
<script type="text/javascript" src="fullpage/jquery.fullpage.extensions.min.js"></script>
324330
```
325331

326-
A license key will be required for each extension. [See more details about it here](https://github.com/alvarotrigo/fullPage.js/wiki/How-to-activate-a-fullPage.js-extension).
332+
An activation key and a license key will be required for each extension. [See more details about it here](https://github.com/alvarotrigo/fullPage.js/wiki/How-to-activate-a-fullPage.js-extension).
327333

328334
Then you will be able to use and configure them as explained in [options](https://github.com/alvarotrigo/fullPage.js#options).
329335

@@ -410,7 +416,7 @@ To define the percentage of each section the attribute `data-percentage` must be
410416

411417
- `animateAnchor`: (default `true`) Defines whether the load of the site when given an anchor (#) will scroll with animation to its destination or will directly load on the given section.
412418

413-
- `recordHistory`: (default `true`) Defines whether to push the state of the site to the browser's history. When set to `true` each section/slide of the site will act as a new page and the back and forward buttons of the browser will scroll the sections/slides to reach the previous or next state of the site. When set to `false`, the URL will keep changing but will have no effect ont he browser's history. This option is automatically turned off when using `autoScrolling:false`.
419+
- `recordHistory`: (default `true`) Defines whether to push the state of the site to the browser's history. When set to `true` each section/slide of the site will act as a new page and the back and forward buttons of the browser will scroll the sections/slides to reach the previous or next state of the site. When set to `false`, the URL will keep changing but will have no effect on the browser's history. This option is automatically turned off when using `autoScrolling:false`.
414420

415421
- `menu`: (default `false`) A selector can be used to specify the menu to link with the sections. This way the scrolling of the sections will activate the corresponding element in the menu using the class `active`.
416422
This won't generate a menu but will just add the `active` class to the element in the given menu with the corresponding anchor links.
@@ -847,7 +853,8 @@ To see the list of recent changes, see [Releases section](https://github.com/alv
847853
Want to build fullpage.js distribution files? Please see [Build Tasks](https://github.com/alvarotrigo/fullPage.js/wiki/Build-tasks)
848854

849855
#Resources
850-
- [Wordpress theme](https://goo.gl/HuFudq)
856+
- [Wordpress theme 1](http://alvarotrigo.com/fullPage/utils/wordpress-y-theme.html)
857+
- [Wordpress theme 2](http://alvarotrigo.com/fullPage/utils/wordpress.html)
851858
- [CSS Easing Animation Tool - Matthew Lein](http://matthewlein.com/ceaser/) (useful to define the `easingcss3` value)
852859
- [fullPage.js jsDelivr CDN](http://www.jsdelivr.com/#!jquery.fullpage)
853860
- [fullPage.js plugin for October CMS](http://octobercms.com/plugin/freestream-parallax)

‎README_SPANISH.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,20 @@
77
<a href="https://github.com/alvarotrigo/fullPage.js"><img src="https://raw.githubusercontent.com/alvarotrigo/fullPage.js/dev/examples/imgs/en-language-inactive.png" /></a><a href="https://github.com/alvarotrigo/fullPage.js/blob/dev/README_SPANISH.md#fullpagejs"><img src="https://raw.githubusercontent.com/alvarotrigo/fullPage.js/dev/examples/imgs/es-language.png?v=2" /></a>
88
</p>
99

10-
![fullPage.js version](http://img.shields.io/badge/fullPage.js-v2.8.8-brightgreen.svg)
10+
<p align="center">
11+
<a href="http://alvarotrigo.com/fullPage/utils/wordpress-y-theme.html"><img src="http://alvarotrigo.com/fullPage/imgs/wodpress-y-theme-fullpage1.png" /></a>
12+
</p>
13+
14+
![fullPage.js version](http://img.shields.io/badge/fullPage.js-v2.9.0-brightgreen.svg)
1115
[![License](http://img.shields.io/badge/License-MIT-blue.svg)](http://opensource.org/licenses/MIT)
1216
7Kb en gzip!
1317

1418
Un sencillo plugin de jQuery para la creación de páginas web con scroll a pantalla completa. (también conocido popularmente como "single page websites" o "onepage sites")
1519
Permite crear un desplazamiento a pantalla completa asi como añadir diapositivas horizontales en las secciones.
1620

1721
- [Vista previa - demostración](http://alvarotrigo.com/fullPage/)
18-
- [Template de Wordpress](https://goo.gl/HuFudq)
22+
- [Template de Wordpress 1](http://alvarotrigo.com/fullPage/utils/wordpress-y-theme.html)
23+
- [Template de Wordpress 2](http://alvarotrigo.com/fullPage/utils/wordpress.html)
1924
- [Extensiones de fullpage.js](http://alvarotrigo.com/fullPage/extensions/)
2025
- [Preguntas frecuentes](https://github.com/alvarotrigo/fullPage.js/wiki/FAQ---Frequently-Answered-Questions)
2126

@@ -311,19 +316,18 @@ Los elementos multimedia HTML 5 incrustados `<video>` / `<audio>` y los iframes
311316
###Uso de extensiones
312317
fullPage.js [provee varias extensiones](http://alvarotrigo.com/fullPage/extensions/) que puedes usar para mejorar sus ya increibles efectos. Todas las extensiones están la lista de [las opciones de fullPage.js](https://github.com/alvarotrigo/fullPage.js/blob/master/README_SPANISH.md#opciones)
313318

314-
Las extensiones requiren el uso del archivo comprimido `jquery.fullpage.extensions.min.js` en lugar del archivo habitual de fullPage.js (`jquery.fullpage.js`).
315-
Una vez adquiras el archivo correspondiente a la extensión que quieras usar, tendrás que añadirlo antes del archivo de fullPage.js. Por ejemplo:
319+
Las extensiones requiren el uso del archivo comprimido [`jquery.fullpage.extensions.min.js`](https://github.com/alvarotrigo/fullPage.js/blob/master/dist/jquery.fullpage.extensions.min.js) disponible [en la carpeta `dist`](https://github.com/alvarotrigo/fullPage.js/tree/master/dist) en lugar del archivo habitual de fullPage (`jquery.fullpage.js` o `jquery.fullpage.min.js`).
320+
Una vez adquiras el archivo correspondiente a la extensión que quieras usar, tendrás que añadirlo antes del archivo de fullPage. Por ejemplo, si quiero usar la extension Continuous Horizontal tendré que añadir el fichero de la extension y después el fichero de fullPage version extensiones.
316321

317322
```html
318323
<script type="text/javascript" src="fullpage.continuousHorizontal.min.js"></script>
319324
<script type="text/javascript" src="fullpage/jquery.fullpage.extensions.min.js"></script>
320325
```
321326

322-
Cada extensión requiere de una licencia. [Ve más detalles sobe el uso de licencias aquí](https://github.com/alvarotrigo/fullPage.js/wiki/How-to-activate-a-fullPage.js-extension).
327+
Cada extensión requiere de una licencia y de una clave de activación. [Ver más detalles sobe el uso de licencias aquí](https://github.com/alvarotrigo/fullPage.js/wiki/How-to-activate-a-fullPage.js-extension).
323328

324329
Luego podrás usar la extension y configurarla tal y como se explica en las [opciones](https://github.com/alvarotrigo/fullPage.js/blob/master/README_SPANISH.md#opciones).
325330

326-
327331
## Opciones
328332

329333
- `controlArrows`: (default `true`) Determina si usar flechas de contrl en las diapostiivas para deslizar hacia la derecha o izquierda.
@@ -846,7 +850,8 @@ Solo disponible en ingles :)
846850
Want to build fullpage.js distribution files? Please see [Build Tasks](https://github.com/alvarotrigo/fullPage.js/wiki/Build-tasks)
847851

848852
#Recursos
849-
- [Template de Wordpress](https://goo.gl/HuFudq)
853+
- [Template de Wordpress 1](http://alvarotrigo.com/fullPage/utils/wordpress-y-theme.html)
854+
- [Template de Wordpress 2](http://alvarotrigo.com/fullPage/utils/wordpress.html)
850855
- [Herramienta de animacion de CSS Easing - Matthew Lein](http://matthewlein.com/ceaser/) (útil para definir la opción `easingcss3`)
851856
- [fullPage.js jsDelivr CDN](http://www.jsdelivr.com/#!jquery.fullpage)
852857
- [fullPage.js plugin para October CMS](http://octobercms.com/plugin/freestream-parallax)

‎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.9
2+
* fullPage 2.9.0
33
* https://github.com/alvarotrigo/fullPage.js
44
* MIT licensed
55
*

‎dist/jquery.fullpage.extensions.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/jquery.fullpage.js

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* fullPage 2.8.9
2+
* fullPage 2.9.0
33
* https://github.com/alvarotrigo/fullPage.js
44
* @license MIT licensed
55
*
@@ -228,6 +228,11 @@
228228
* It changes the scroll bar visibility and the history of the site as a result.
229229
*/
230230
function setAutoScrolling(value, type){
231+
//removing the transformation
232+
if(!value){
233+
silentScroll(0);
234+
}
235+
231236
setVariableState('autoScrolling', value, type);
232237

233238
var element = $(SECTION_ACTIVE_SEL);
@@ -265,8 +270,6 @@
265270
'touch-action': ''
266271
});
267272

268-
silentScroll(0);
269-
270273
//scrolling the page to the section with no animation
271274
if (element.length) {
272275
$htmlBody.scrollTop(element.position().top);
@@ -1823,6 +1826,11 @@
18231826
function onkeydown(e){
18241827
var shiftPressed = e.shiftKey;
18251828

1829+
//do nothing if we can not scroll or we are not using horizotnal key arrows.
1830+
if(!canScroll && [37,39].indexOf(e.which) < 0){
1831+
return;
1832+
}
1833+
18261834
switch (e.which) {
18271835
//up
18281836
case 38:
@@ -2538,11 +2546,13 @@
25382546
* Adds the possibility to auto scroll through sections on touch devices.
25392547
*/
25402548
function addTouchHandler(){
2541-
if(options.autoScrolling && (isTouchDevice || isTouch)){
2549+
if(isTouchDevice || isTouch){
25422550
//Microsoft pointers
25432551
var MSPointer = getMSPointer();
25442552

2545-
$body.off('touchmove ' + MSPointer.move).on('touchmove ' + MSPointer.move, preventBouncing);
2553+
if(options.autoScrolling){
2554+
$body.off('touchmove ' + MSPointer.move).on('touchmove ' + MSPointer.move, preventBouncing);
2555+
}
25462556

25472557
$(WRAPPER_SEL)
25482558
.off('touchstart ' + MSPointer.down).on('touchstart ' + MSPointer.down, touchStartHandler)
@@ -2632,16 +2642,16 @@
26322642
// that's why we round it to 0.
26332643
var roundedTop = Math.round(top);
26342644

2635-
if(options.scrollBar || !options.autoScrolling){
2636-
container.scrollTop(roundedTop);
2637-
}
2638-
else if (options.css3) {
2645+
if (options.css3 && options.autoScrolling && !options.scrollBar){
26392646
var translate3d = 'translate3d(0px, -' + roundedTop + 'px, 0px)';
26402647
transformContainer(translate3d, false);
26412648
}
2642-
else {
2649+
else if(options.autoScrolling && !options.scrollBar){
26432650
container.css('top', -roundedTop);
26442651
}
2652+
else{
2653+
$htmlBody.scrollTop(roundedTop);
2654+
}
26452655
}
26462656

26472657
/**

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

0 commit comments

Comments
 (0)