Skip to content

Commit fcc11b0

Browse files
alvarotrigoalvarotrigo
authored
Merge pull request alvarotrigo#2465 from alvarotrigo/dev
Mergin dev branch 2.9.1
2 parents 3e33e65 + 97788da commit fcc11b0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1176
-461
lines changed

‎README.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<a href="http://alvarotrigo.com/fullPage/utils/wordpress-y-theme.html"><img src="http://alvarotrigo.com/fullPage/imgs/wodpress-y-theme-fullpage1.png" /></a>
1212
</p>
1313

14-
![fullPage.js version](http://img.shields.io/badge/fullPage.js-v2.9.0-brightgreen.svg)
14+
![fullPage.js version](http://img.shields.io/badge/fullPage.js-v2.9.1-brightgreen.svg)
1515
[![License](http://img.shields.io/badge/License-MIT-blue.svg)](http://opensource.org/licenses/MIT)
1616
7Kb gziped!
1717

@@ -182,6 +182,7 @@ $(document).ready(function() {
182182
fadingEffect: false,
183183
normalScrollElements: '#element1, .element2',
184184
scrollOverflow: false,
185+
scrollOverflowReset: false,
185186
scrollOverflowOptions: null,
186187
touchSensitivity: 15,
187188
normalScrollElementTouchThreshold: 5,
@@ -450,8 +451,9 @@ $('#fullpage').fullpage({
450451

451452
- `slidesNavPosition`: (default `bottom`) Defines the position for the landscape navigation bar for sliders. Admits `top` and `bottom` as values. You may want to modify the CSS styles to determine the distance from the top or bottom as well as any other style such as color.
452453

453-
- `scrollOverflow`: (default `false`) defines whether or not to create a scroll for the section/slide in case its content is bigger than the height of it. When set to `true`, your content will be wrapped by the plugin. Consider using delegation or load your other scripts in the `afterRender` callback.
454-
In case of setting it to `true`, it requires the vendor library [`scrolloverflow.min.js`](https://github.com/alvarotrigo/fullPage.js/blob/master/vendors/scrolloverflow.min.js) and it should be loaded before the fullPage.js plugin. For example:
454+
- `scrollOverflow`: (default `false`) (not compatible with IE 8) defines whether or not to create a scroll for the section/slide in case its content is bigger than the height of it. When set to `true`, your content will be wrapped by the plugin. Consider using delegation or load your other scripts in the `afterRender` callback.
455+
In case of setting it to `true`, it requires the vendor library [`scrolloverflow.min.js`](https://github.com/alvarotrigo/fullPage.js/blob/master/vendors/scrolloverflow.min.js) and it should be loaded before the fullPage.js plugin.
456+
For example:
455457

456458
```html
457459
<script type="text/javascript" src="vendors/scrolloverflow.min.js"></script>
@@ -460,6 +462,8 @@ In case of setting it to `true`, it requires the vendor library [`scrolloverflow
460462

461463
In order to prevent fullpage.js from creating the scrollbar in certain sections or slides use the class `fp-noscroll`. For example: `<div class="section fp-noscroll">`
462464

465+
- `scrollOverflowReset`: (default `false`) [Extension of fullpage.js](http://alvarotrigo.com/fullPage/extensions/). When set to `true` it scrolls up the content of the section/slide with scroll bar when leaving to another vertical section. This way the section/slide will always show the start of its content even when scrolling from a section under it.
466+
463467
- `scrollOverflowOptions`: when using scrollOverflow:true fullpage.js will make use of a forked and modified version of [iScroll.js libary](https://github.com/cubiq/iscroll/). You can customize the scrolling behaviour by providing fullpage.js with the iScroll.js options you want to use. Check [its documentation](http://iscrolljs.com/) for more info.
464468

465469
- `sectionSelector`: (default `.section`) Defines the jQuery selector used for the plugin sections. It might need to be changed sometimes to avoid problem with other plugins using the same selectors as fullpage.js.

‎README_SPANISH.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<a href="http://alvarotrigo.com/fullPage/utils/wordpress-y-theme.html"><img src="http://alvarotrigo.com/fullPage/imgs/wodpress-y-theme-fullpage1.png" /></a>
1212
</p>
1313

14-
![fullPage.js version](http://img.shields.io/badge/fullPage.js-v2.9.0-brightgreen.svg)
14+
![fullPage.js version](http://img.shields.io/badge/fullPage.js-v2.9.1-brightgreen.svg)
1515
[![License](http://img.shields.io/badge/License-MIT-blue.svg)](http://opensource.org/licenses/MIT)
1616
7Kb en gzip!
1717

@@ -181,6 +181,7 @@ $(document).ready(function() {
181181
fadingEffect: false,
182182
normalScrollElements: '#element1, .element2',
183183
scrollOverflow: false,
184+
scrollOverflowReset: false,
184185
scrollOverflowOptions: null,
185186
touchSensitivity: 15,
186187
normalScrollElementTouchThreshold: 5,
@@ -443,7 +444,7 @@ $('#fullpage').fullpage({
443444

444445
- `slidesNavPosition`: (default `bottom`) Determina la posición que tomará la navegación para las diapositivas horizontales de la página. Admite los valores `top` y `bottom`. Tal vez quieras modificar la distancia inferior o superior usando estilos CSS así como el color de los mismos.
445446

446-
- `scrollOverflow`: (default `false`) Determina si crear o no una barra de desplazamiento para las secciones/diapositivas donde el contenido de las mismas sea mayor que la altura de la ventana del navegador. Cuando se define a `true`, el contenido de la sección/diapositiva será embuelto por el plugin en un contenedor. En estos casos, considera usar delegación o usar los eventos Javascript en el callback `afterRender`.
447+
- `scrollOverflow`: (default `false`) (no compatible con IE 8) Determina si crear o no una barra de desplazamiento para las secciones/diapositivas donde el contenido de las mismas sea mayor que la altura de la ventana del navegador. Cuando se define a `true`, el contenido de la sección/diapositiva será embuelto por el plugin en un contenedor. En estos casos, considera usar delegación o usar los eventos Javascript en el callback `afterRender`.
447448
Cuando se usa `true` esta opción requiere del uso de la librería externa [`scrolloverflow.min.js`](https://github.com/alvarotrigo/fullPage.js/blob/master/vendors/scrolloverflow.min.js) y debe de ser añadida antes que fullPage.js. Por ejemplo
448449

449450
```html
@@ -453,6 +454,8 @@ Cuando se usa `true` esta opción requiere del uso de la librería externa [`scr
453454

454455
Para evitar que fullPage.js crea la barra de desplazamiento en ciertas secciones o diapositivas, haz uso de la clase ` fp-noscroll`. Por ejemplo: `<div class="section fp-noscroll">`
455456

457+
- `scrollOverflowReset`: (default `false`) [Extensión de fullpage.js](http://alvarotrigo.com/fullPage/extensions/). Cuando se define a `true` fullPage.js moverá el contenido de la seccion o diapositiva hacia arriba cuando se abandone la seccion o diapositiva hacia otra sección vertical. De este modo, cuando se llega a una sección que usa barra de desplazamiento, se mostrará siempre el principio de su contenido.
458+
456459
- `scrollOverflowOptions`: cuando se usa la opcion de scrollOverflow:true fullPage.js hará uso de una versión modificada de la [libería iScroll.js](https://github.com/cubiq/iscroll/). Puedes personalizar el comportamiento de dicho componente aportando a fullPage.js las opciones de iScroll que quieras usar haciendo uso de esta opción. Mira [la documentacion de iScroll](http://iscrolljs.com/) para más información.
457460

458461
- `sectionSelector`: (default `.section`) Determina el selector de jQuery que fullPage.js usará para determinar lo que es una sección. Puede que necesites cambiarlo para evitar problemas con otras librerías que usen el mismo selector que usa fullPage.js por defecto.

‎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.9.0
2+
* fullPage 2.9.1
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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* fullPage 2.9.0
2+
* fullPage 2.9.1
33
* https://github.com/alvarotrigo/fullPage.js
44
* @license MIT licensed
55
*
@@ -144,6 +144,7 @@
144144
fadingEffect: false,
145145
normalScrollElements: null,
146146
scrollOverflow: false,
147+
scrollOverflowReset: false,
147148
scrollOverflowHandler: iscrollHandler,
148149
scrollOverflowOptions: null,
149150
touchSensitivity: 5,
@@ -2817,7 +2818,7 @@
28172818
* Displays warnings
28182819
*/
28192820
function displayWarnings(){
2820-
var extensions = ['fadingEffect', 'continuousHorizontal', 'scrollHorizontally', 'interlockedSlides', 'resetSliders', 'responsiveSlides', 'offsetSections', 'dragAndMove'];
2821+
var extensions = ['fadingEffect', 'continuousHorizontal', 'scrollHorizontally', 'interlockedSlides', 'resetSliders', 'responsiveSlides', 'offsetSections', 'dragAndMove', 'scrollOverflowReset'];
28212822
if($('html').hasClass(ENABLED)){
28222823
showError('error', 'Fullpage.js can only be initialized once and you are doing it multiple times!');
28232824
return;

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