Skip to content

Commit 70daf8f

Browse files
authored
Merge branch 'master' into feature/open-active-slide-on-enter
2 parents 9612f7b + 25e52e2 commit 70daf8f

16 files changed

+36
-14
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</a>
55
<br><br>
66
<a href="https://github.com/hakimel/reveal.js/actions"><img src="https://github.com/hakimel/reveal.js/workflows/tests/badge.svg"></a>
7-
<a href="https://slides.com/"><img src="https://s3.amazonaws.com/static.slid.es/images/slides-github-banner-320x40.png?1" alt="Slides" width="160" height="20"></a>
7+
<a href="https://slides.com/"><img src="https://static.slid.es/images/slides-github-banner-320x40.png?1" alt="Slides" width="160" height="20"></a>
88
</p>
99

1010
reveal.js is an open source HTML presentation framework. It enables anyone with a web browser to create beautiful presentations for free. Check out the live demo at [revealjs.com](https://revealjs.com/).

demo.html

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,25 @@ <h2>Touch Optimized</h2>
197197
</script>
198198
</section>
199199

200+
<section>
201+
<h2>Lightbox</h2>
202+
Turn any element into a <a href="https://revealjs.com/lightbox/">lightbox</a> using <strong>data‑preview‑image</strong> & <strong>data‑preview‑video</strong>.
203+
<div class="r-hstack" style="gap: 2rem;">
204+
<div>
205+
<pre style="font-size: 12px; width: 100%"><code class="html" data-trim>
206+
&lt;img src="image.png" data-preview-image="image.png"&gt;
207+
</code></pre>
208+
<img src="https://static.slid.es/logo/v2/slides-symbol-1024x1024.png" height="100" data-preview-image>
209+
</div>
210+
<div>
211+
<pre style="font-size: 12px; width: 100%"><code class="html" data-trim>
212+
&lt;img src="video.png" data-preview-video="video.mp4"&gt;
213+
</code></pre>
214+
<img src="https://static.slid.es/site/homepage/v1/homepage-video-editor.png" height="100" data-preview-video="https://static.slid.es/site/homepage/v1/homepage-video-editor.mp4">
215+
</div>
216+
</div>
217+
</section>
218+
200219
<section>
201220
<p>Add the <code>r-fit-text</code> class to auto-size text</p>
202221
<h2 class="r-fit-text">FIT TEXT</h2>

dist/reveal.esm.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/reveal.esm.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/reveal.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/reveal.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/backgrounds.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ <h2>Same background twice (1/2)</h2>
8989
<h2>Same background twice (2/2)</h2>
9090
</section>
9191

92-
<section data-background-video="https://s3.amazonaws.com/static.slid.es/site/homepage/v1/homepage-video-editor.mp4,https://s3.amazonaws.com/static.slid.es/site/homepage/v1/homepage-video-editor.webm">
92+
<section data-background-video="https://static.slid.es/site/homepage/v1/homepage-video-editor.mp4,https://static.slid.es/site/homepage/v1/homepage-video-editor.webm">
9393
<h2>Video background</h2>
9494
</section>
9595

File renamed without changes.

examples/markdown.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<!-- Images -->
122122
<section data-markdown>
123123
<script type="text/template">
124-
![Sample image](https://s3.amazonaws.com/static.slid.es/logo/v2/slides-symbol-512x512.png)
124+
![Sample image](https://static.slid.es/logo/v2/slides-symbol-512x512.png)
125125
</script>
126126
</section>
127127

examples/markdown.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Content 3.2
3333

3434
## External 3.3 (Image)
3535

36-
![External Image](https://s3.amazonaws.com/static.slid.es/logo/v2/slides-symbol-512x512.png)
36+
![External Image](https://static.slid.es/logo/v2/slides-symbol-512x512.png)
3737

3838

3939
## External 3.4 (Math)

examples/scroll.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ <h2 data-id="code-title">Code highlights,<br />meet scroll triggers</h2>
9191
<section data-background="https://static.slid.es/reveal/image-placeholder.png" id="image-bg">
9292
<h2>Image Backgrounds</h2>
9393
</section>
94-
<section data-background-video-muted data-background-video="https://s3.amazonaws.com/static.slid.es/site/homepage/v1/homepage-video-editor.mp4,https://s3.amazonaws.com/static.slid.es/site/homepage/v1/homepage-video-editor.webm">
94+
<section data-background-video-muted data-background-video="https://static.slid.es/site/homepage/v1/homepage-video-editor.mp4,https://static.slid.es/site/homepage/v1/homepage-video-editor.webm">
9595
<div style="background-color: rgba(0, 0, 0, 0.9); color: #fff; padding: 20px;">
9696
<h2>Video background</h2>
9797
</div>

js/reveal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import {
2929
} from './utils/constants.js'
3030

3131
// The reveal.js version
32-
export const VERSION = '5.2.0';
32+
export const VERSION = '5.2.1';
3333

3434
/**
3535
* reveal.js

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "reveal.js",
3-
"version": "5.2.0",
3+
"version": "5.2.1",
44
"description": "The HTML Presentation Framework",
55
"homepage": "https://revealjs.com",
66
"subdomain": "revealjs",

plugin/notes/notes.esm.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugin/notes/notes.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugin/notes/speaker-view.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,9 +504,12 @@ <h4 class="label">Notes</h4>
504504
notes.classList.add( 'hidden' );
505505
}
506506

507+
// Don't show lightboxes in the upcoming slide
508+
const { previewVideo, previewImage, previewIframe, ...upcomingState } = data.state;
509+
507510
// Update the note slides
508511
currentSlide.contentWindow.postMessage( JSON.stringify({ method: 'setState', args: [ data.state ] }), '*' );
509-
upcomingSlide.contentWindow.postMessage( JSON.stringify({ method: 'setState', args: [ data.state ] }), '*' );
512+
upcomingSlide.contentWindow.postMessage( JSON.stringify({ method: 'setState', args: [ upcomingState ] }), '*' );
510513
upcomingSlide.contentWindow.postMessage( JSON.stringify({ method: 'next' }), '*' );
511514

512515
}

0 commit comments

Comments
 (0)