1
0
mirror of https://github.com/webslides/WebSlides.git synced 2025-08-16 01:54:53 +02:00
This commit is contained in:
Antonio Laguna
2017-07-28 11:54:48 +02:00
parent eea1b46f02
commit 50cb44c85f
3 changed files with 25 additions and 12 deletions

View File

@@ -1,7 +1,7 @@
/*! /*!
* Name: WebSlides * Name: WebSlides
* Version: 1.3.1 * Version: 1.3.1
* Date: 2017-07-24 * Date: 2017-07-28
* Description: Making HTML presentations easy * Description: Making HTML presentations easy
* URL: https://github.com/webslides/webslides#readme * URL: https://github.com/webslides/webslides#readme
* Credits: @jlantunez, @LuisSacristan, @Belelros * Credits: @jlantunez, @LuisSacristan, @Belelros
@@ -350,6 +350,11 @@ webslides.js will add .ws-ready automatically. Don't worry :) -- */
overflow: hidden; overflow: hidden;
width: 100%; } width: 100%; }
.ws-ready.ws-ready-zoom {
overflow: visible; }
.ws-ready.ws-ready-zoom body {
overflow: auto; }
#webslides { #webslides {
-ms-overflow-style: none; -ms-overflow-style: none;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
@@ -2917,12 +2922,12 @@ Solution: stackoverflow.com/questions/34250282/flexbox-safari-bug-flex-wrap
@media screen and (max-width: 567px) { @media screen and (max-width: 567px) {
#webslides-zoomed > .wrap > .grid > .column { #webslides-zoomed > .wrap > .grid > .column {
width: 100%; } } width: 100%; } }
@media screen and (min-width: 568px) and (max-width: 1023px) { @media screen and (min-width: 568px) and (max-width: 1024px) {
#webslides-zoomed > .wrap > .grid > .column { #webslides-zoomed > .wrap > .grid > .column {
width: 50%; } } width: 50%; } }
@media screen and (orientation: portrait) { @media screen and (max-width: 567px) and (orientation: portrait) {
#webslides-zoomed > .wrap > .grid > .column { #webslides-zoomed > .wrap > .grid > .column {
width: 50%; } } width: 100%; } }
#webslides-zoomed > .wrap > .grid > .column > .wrap-zoom { #webslides-zoomed > .wrap > .grid > .column > .wrap-zoom {
display: inline-block; display: inline-block;
height: 25vh; height: 25vh;
@@ -3002,7 +3007,7 @@ Solution: stackoverflow.com/questions/34250282/flexbox-safari-bug-flex-wrap
#webslides.disabled { #webslides.disabled {
-webkit-filter: blur(10px); -webkit-filter: blur(10px);
filter: blur(10px); filter: blur(10px);
/* BLur makes scroll no accesible */ /* Blur makes scroll no accesible */
width: calc(100% - 10px); } width: calc(100% - 10px); }
/*========================================= /*=========================================

View File

@@ -1,7 +1,7 @@
/*! /*!
* Name: WebSlides * Name: WebSlides
* Version: 1.3.1 * Version: 1.3.1
* Date: 2017-07-24 * Date: 2017-07-28
* Description: Making HTML presentations easy * Description: Making HTML presentations easy
* URL: https://github.com/webslides/webslides#readme * URL: https://github.com/webslides/webslides#readme
* Credits: @jlantunez, @LuisSacristan, @Belelros * Credits: @jlantunez, @LuisSacristan, @Belelros
@@ -2792,7 +2792,8 @@ var CLASSES = {
WRAP: 'wrap-zoom', WRAP: 'wrap-zoom',
WRAP_CONTAINER: 'wrap', WRAP_CONTAINER: 'wrap',
CURRENT: 'current', CURRENT: 'current',
SLIDE: 'slide' SLIDE: 'slide',
ZOOM_ENABLED: 'ws-ready-zoom'
}; };
var ID = 'webslides-zoomed'; var ID = 'webslides-zoomed';
@@ -2905,9 +2906,11 @@ var Zoom = function () {
var wrap = __WEBPACK_IMPORTED_MODULE_0__utils_dom__["a" /* default */].wrap(elem.el, 'div'); var wrap = __WEBPACK_IMPORTED_MODULE_0__utils_dom__["a" /* default */].wrap(elem.el, 'div');
wrap.className = CLASSES.WRAP; wrap.className = CLASSES.WRAP;
wrap.setAttribute('id', 'zoomed-' + elem.el.getAttribute('id')); wrap.setAttribute('id', 'zoomed-' + elem.el.getAttribute('id'));
// Slide container, need due to flexbox styles // Slide container, need due to flexbox styles
var div = __WEBPACK_IMPORTED_MODULE_0__utils_dom__["a" /* default */].wrap(wrap, 'div'); var div = __WEBPACK_IMPORTED_MODULE_0__utils_dom__["a" /* default */].wrap(wrap, 'div');
div.className = CLASSES.DIV; div.className = CLASSES.DIV;
// Adding some layer for controlling click events // Adding some layer for controlling click events
var divLayer = __WEBPACK_IMPORTED_MODULE_0__utils_dom__["a" /* default */].createNode('div'); var divLayer = __WEBPACK_IMPORTED_MODULE_0__utils_dom__["a" /* default */].createNode('div');
divLayer.className = 'zoom-layer'; divLayer.className = 'zoom-layer';
@@ -2917,6 +2920,7 @@ var Zoom = function () {
_this2.ws_.goToSlide(elem.i); _this2.ws_.goToSlide(elem.i);
}); });
wrap.appendChild(divLayer); wrap.appendChild(divLayer);
// Slide number // Slide number
var slideNumber = __WEBPACK_IMPORTED_MODULE_0__utils_dom__["a" /* default */].createNode('p', '', '' + (elem.i + 1)); var slideNumber = __WEBPACK_IMPORTED_MODULE_0__utils_dom__["a" /* default */].createNode('p', '', '' + (elem.i + 1));
slideNumber.className = 'text-slide-number'; slideNumber.className = 'text-slide-number';
@@ -2949,20 +2953,24 @@ var Zoom = function () {
this.enable(); this.enable();
var currentId = this.ws_.currentSlide_.el.id; var currentId = this.ws_.currentSlide_.el.id;
var zoomedCurrent = this.zws_.el.querySelector('.' + CLASSES.WRAP + '.' + CLASSES.CURRENT); var zoomedCurrent = this.zws_.el.querySelector('.' + CLASSES.WRAP + '.' + CLASSES.CURRENT);
if (zoomedCurrent) { if (zoomedCurrent) {
zoomedCurrent.classList.remove(CLASSES.CURRENT); zoomedCurrent.classList.remove(CLASSES.CURRENT);
} }
var actualCurrent = this.zws_.el.querySelector('#zoomed-' + currentId); var actualCurrent = this.zws_.el.querySelector('#zoomed-' + currentId);
actualCurrent.classList.add(CLASSES.CURRENT); actualCurrent.classList.add(CLASSES.CURRENT);
this.isZoomed_ = true; this.isZoomed_ = true;
document.body.style.overflow = 'auto'; document.documentElement.classList.add(CLASSES.ZOOM_ENABLED);
setTimeout(function () { setTimeout(function () {
_this3.ws_.disable(); _this3.ws_.disable();
_this3.zws_.el.classList.add('in'); _this3.zws_.el.classList.add('in');
var wrapCSS = window.getComputedStyle(_this3.zws_.grid); var wrapCSS = window.getComputedStyle(_this3.zws_.grid);
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__utils_scroll_to__["a" /* default */])(actualCurrent.parentNode.offsetTop + __WEBPACK_IMPORTED_MODULE_0__utils_dom__["a" /* default */].parseSize(wrapCSS.paddingTop), 50, function () {}, document.body); var scrollingElement = document.scrollingElement || document.body;
__webpack_require__.i(__WEBPACK_IMPORTED_MODULE_2__utils_scroll_to__["a" /* default */])(actualCurrent.parentNode.offsetTop + __WEBPACK_IMPORTED_MODULE_0__utils_dom__["a" /* default */].parseSize(wrapCSS.paddingTop), 50, function () {}, scrollingElement);
}, 50); }, 50);
} }
@@ -2981,7 +2989,7 @@ var Zoom = function () {
_this4.ws_.enable(); _this4.ws_.enable();
_this4.disable(); _this4.disable();
_this4.isZoomed_ = false; _this4.isZoomed_ = false;
document.body.style.overflow = ''; document.documentElement.classList.remove(CLASSES.ZOOM_ENABLED);
}, 400); }, 400);
} }

File diff suppressed because one or more lines are too long