Skip to content

Commit 5a525ad

Browse files
author
Marcin Szczepanski
committed
Remove inadvertant dependency on Reveal that was re-added
1 parent ae9cf04 commit 5a525ad

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/gallery.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
};
2424
};
2525

26-
Gallery.start = function (galleryNode) {
26+
Gallery.start = function (galleryNode, contextNode) {
27+
contextNode = contextNode || document.body.firstChild;
2728
galleryMode = galleryNode.dataset.mode || 'normal';
2829

2930
if (galleryMode === 'full-screen') {
@@ -39,9 +40,8 @@
3940
placeholder.id = "gallery-placeholder";
4041
galleryNode.parentNode.replaceChild(placeholder, galleryNode);
4142

42-
var slidesNode = document.querySelector(".slides");
43-
if (slidesNode) {
44-
slidesNode.parentNode.insertBefore(galleryNode, slidesNode);
43+
if (contextNode.parentNode) {
44+
contextNode.parentNode.insertBefore(galleryNode, contextNode);
4545
}
4646
}
4747

@@ -75,13 +75,11 @@
7575
};
7676

7777
// FIXME Gallery.stop should take elem and root nodes as well
78-
Gallery.stop = function () {
78+
Gallery.stop = function (galleryNode, contextNode) {
7979
clearInterval(galleryTimer);
8080

8181
if (galleryMode === "full-screen") {
8282
// - put the gallery back where it was
83-
var slidesNode = document.querySelector('.slides');
84-
var galleryNode = slidesNode.previousSibling;
8583
var placeholder = document.getElementById("gallery-placeholder");
8684
placeholder.parentNode.replaceChild(galleryNode, placeholder);
8785

src/gallery.reveal.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
(function() {
22
if( typeof window.addEventListener === 'function' ) {
3+
var slidesNode = document.querySelector(".slides");
34
Reveal.addEventListener("slidechanged", function (event) {
4-
if (event.previousSlide.querySelector('.gallery') || document.querySelector('.reveal > .gallery')) {
5-
Gallery.stop();
5+
var galleryNode = event.previousSlide.querySelector('.gallery') || document.querySelector('.reveal > .gallery');
6+
if (galleryNode) {
7+
Gallery.stop(galleryNode, slidesNode);
68
}
79

8-
var galleryNode = event.currentSlide.querySelector('.gallery');
10+
galleryNode = event.currentSlide.querySelector('.gallery');
911
if (galleryNode) {
10-
Gallery.start(galleryNode);
12+
Gallery.start(galleryNode, slidesNode);
1113
}
1214

1315
});
@@ -16,7 +18,7 @@
1618
if (Reveal.getCurrentSlide()) {
1719
var galleryNode = Reveal.getCurrentSlide().querySelector('.gallery');
1820
if (galleryNode) {
19-
Gallery.start(galleryNode);
21+
Gallery.start(galleryNode, slidesNode);
2022
}
2123
}
2224
}

0 commit comments

Comments
 (0)