Browse Source

Fix #81

pull/98/head
Jānis Skarnelis 4 years ago
parent
commit
cf1b5e4201
  1. 2
      dist/fancybox.esm.js
  2. 2
      dist/fancybox.umd.js
  3. 2
      src/Fancybox/Fancybox.js
  4. 10
      src/Fancybox/plugins/Html/Html.js
  5. 12
      src/Fancybox/plugins/Toolbar/Toolbar.js
  6. 7
      src/shared/utils/canUseDOM.js

2
dist/fancybox.esm.js

File diff suppressed because one or more lines are too long

2
dist/fancybox.umd.js

File diff suppressed because one or more lines are too long

2
src/Fancybox/Fancybox.js

@ -1385,7 +1385,7 @@ class Fancybox extends Base {
} }
if (!Fancybox.openers.size) { if (!Fancybox.openers.size) {
document.body.addEventListener("click", Fancybox.fromEvent, false); document.addEventListener("click", Fancybox.fromEvent, false);
// Pass self to plugins to avoid circular dependencies // Pass self to plugins to avoid circular dependencies
for (const [key, Plugin] of Object.entries(Fancybox.Plugins || {})) { for (const [key, Plugin] of Object.entries(Fancybox.Plugins || {})) {

10
src/Fancybox/plugins/Html/Html.js

@ -172,7 +172,7 @@ export class Html {
if (slide.width && slide.height) { if (slide.width && slide.height) {
slide.ratio = parseFloat(slide.width) / parseFloat(slide.height); slide.ratio = parseFloat(slide.width) / parseFloat(slide.height);
} else { } else {
slide.ratio = slide.ratio || slide.video.ratio; slide.ratio = slide.ratio || slide.video.ratio || defaults.video.ratio;
} }
} }
} }
@ -509,12 +509,12 @@ export class Html {
* @param {Object} slide * @param {Object} slide
*/ */
playVideo(slide) { playVideo(slide) {
if (slide.type === "html5video") { if (slide.type === "html5video" && slide.video.autoplay) {
const videoElem = slide.$el.querySelector("video"); const $video = slide.$el.querySelector("video");
if (videoElem) { if ($video) {
try { try {
videoElem.play(); $video.play();
} catch (err) {} } catch (err) {}
} }
} }

12
src/Fancybox/plugins/Toolbar/Toolbar.js

@ -5,6 +5,12 @@ import { Fullscreen } from "../../../shared/utils/Fullscreen.js";
import { Slideshow } from "../../../shared/utils/Slideshow.js"; import { Slideshow } from "../../../shared/utils/Slideshow.js";
const defaults = { const defaults = {
// What toolbar items to display
display: ["counter", "zoom", "slideshow", "fullscreen", "thumbs", "close"],
// Only create a toolbar item if there is at least one image in the group
autoEnable: true,
// Toolbar items; can be links, buttons or `div` elements // Toolbar items; can be links, buttons or `div` elements
items: { items: {
counter: { counter: {
@ -121,12 +127,6 @@ const defaults = {
}, },
}, },
}, },
// What toolbar items to display
display: ["counter", "zoom", "slideshow", "fullscreen", "thumbs", "close"],
// Only create a toolbar item if there is at least one image in the group
autoEnable: true,
}; };
export class Toolbar { export class Toolbar {

7
src/shared/utils/canUseDOM.js

@ -1,9 +1,4 @@
/** /**
* Detect if rendering from the client or the server * Detect if rendering from the client or the server
*/ */
export const canUseDOM = !!( export const canUseDOM = !!(typeof window !== "undefined" && window.document && window.document.createElement);
typeof window !== "undefined" &&
window.document &&
window.document.createElement &&
window.document.body
);

Loading…
Cancel
Save