diff options
author | David Mehren | 2021-01-14 21:57:07 +0100 |
---|---|---|
committer | GitHub | 2021-01-14 21:57:07 +0100 |
commit | 2b8aac289a326468ab4eecb442acd59298541399 (patch) | |
tree | b41c7467cd9ee8bcda7559358e32931946f0ec23 /public/js | |
parent | f8757382af059fbbacd9881480a17fbfbebb1d95 (diff) | |
parent | 8e611e42eef5dc0bbc9c7b8e4d679c22a204bc26 (diff) |
Merge pull request #727 from hedgedoc/fix/slideOptionsSanitation
Diffstat (limited to '')
-rw-r--r-- | public/js/reveal-markdown.js | 2 | ||||
-rw-r--r-- | public/js/slide.js | 52 |
2 files changed, 52 insertions, 2 deletions
diff --git a/public/js/reveal-markdown.js b/public/js/reveal-markdown.js index ad5bfd04..c49bb9a2 100644 --- a/public/js/reveal-markdown.js +++ b/public/js/reveal-markdown.js @@ -103,7 +103,7 @@ import { md } from './extra' // prevent script end tags in the content from interfering // with parsing - content = content.replace(/<\/script>/g, SCRIPT_END_PLACEHOLDER) + content = content.replace(/<\/script>/gi, SCRIPT_END_PLACEHOLDER) return '<script type="text/template">' + content + '</script>' } diff --git a/public/js/slide.js b/public/js/slide.js index 3a47ac43..c7852021 100644 --- a/public/js/slide.js +++ b/public/js/slide.js @@ -72,7 +72,57 @@ const defaultOptions = { // options from yaml meta const meta = JSON.parse($('#meta').text()) -var options = meta.slideOptions || {} +var options = { + autoPlayMedia: meta.slideOptions.autoPlayMedia, + autoSlide: meta.slideOptions.autoSlide, + autoSlideStoppable: meta.slideOptions.autoSlideStoppable, + backgroundTransition: meta.slideOptions.backgroundTransition, + center: meta.slideOptions.center, + controls: meta.slideOptions.controls, + controlsBackArrows: meta.slideOptions.controlsBackArrows, + controlsLayout: meta.slideOptions.controlsLayout, + controlsTutorial: meta.slideOptions.controlsTutorial, + defaultTiming: meta.slideOptions.defaultTiming, + display: meta.slideOptions.display, + embedded: meta.slideOptions.embedded, + fragmentInURL: meta.slideOptions.fragmentInURL, + fragments: meta.slideOptions.fragments, + hash: meta.slideOptions.hash, + height: meta.slideOptions.height, + help: meta.slideOptions.help, + hideAddressBar: meta.slideOptions.hideAddressBar, + hideCursorTime: meta.slideOptions.hideCursorTime, + hideInactiveCursor: meta.slideOptions.hideInactiveCursor, + history: meta.slideOptions.history, + keyboard: meta.slideOptions.keyboard, + loop: meta.slideOptions.loop, + margin: meta.slideOptions.margin, + maxScale: meta.slideOptions.maxScale, + minScale: meta.slideOptions.minScale, + minimumTimePerSlide: meta.slideOptions.minimumTimePerSlide, + mobileViewDistance: meta.slideOptions.mobileViewDistance, + mouseWheel: meta.slideOptions.mouseWheel, + navigationMode: meta.slideOptions.navigationMode, + overview: meta.slideOptions.overview, + parallaxBackgroundHorizontal: meta.slideOptions.parallaxBackgroundHorizontal, + parallaxBackgroundImage: meta.slideOptions.parallaxBackgroundImage, + parallaxBackgroundSize: meta.slideOptions.parallaxBackgroundSize, + parallaxBackgroundVertical: meta.slideOptions.parallaxBackgroundVertical, + preloadIframes: meta.slideOptions.preloadIframes, + previewLinks: meta.slideOptions.previewLinks, + progress: meta.slideOptions.progress, + rtl: meta.slideOptions.rtl, + showNotes: meta.slideOptions.showNotes, + shuffle: meta.slideOptions.shuffle, + slideNumber: meta.slideOptions.slideNumber, + theme: meta.slideOptions.theme, + totalTime: meta.slideOptions.totalTime, + touch: meta.slideOptions.touch, + transition: meta.slideOptions.transition, + transitionSpeed: meta.slideOptions.transitionSpeed, + viewDistance: meta.slideOptions.viewDistance, + width: meta.slideOptions.width +} || {} const view = $('.reveal') |