reveal.js - Test Markdown

``` elements and wrap the contents in a ``` @@ -182,11 +281,20 @@ currentState, currentSlide, upcomingSlide, + layoutLabel, + layoutDropdown, connected = false; var socket = io.connect( window.location.origin ), socketId = '{{socketId}}'; + var SPEAKER_LAYOUTS = { + 'default': 'Default', + 'wide': 'Wide', + 'tall': 'Tall', + 'notes-only': 'Notes only' + }; + socket.on( 'statechanged', function( data ) { // ignore data from sockets that aren't ours @@ -205,6 +313,8 @@ } ); + setupLayout(); + // Load our presentation iframes setupIframes(); @@ -362,6 +472,74 @@ } + /** + * Sets up the speaker view layout and layout selector. + */ + function setupLayout() { + + layoutDropdown = document.querySelector( '.speaker-layout-dropdown' ); + layoutLabel = document.querySelector( '.speaker-layout-label' ); + + // Render the list of available layouts + for( var id in SPEAKER_LAYOUTS ) { + var option = document.createElement( 'option' ); + option.setAttribute( 'value', id ); + option.textContent = SPEAKER_LAYOUTS[ id ]; + layoutDropdown.appendChild( option ); + } + + // Monitor the dropdown for changes + layoutDropdown.addEventListener( 'change', function( event ) { + + setLayout( layoutDropdown.value ); + + }, false ); + + // Restore any currently persisted layout + setLayout( getLayout() ); + + } + + /** + * Sets a new speaker view layout. The layout is persisted + * in local storage. + */ + function setLayout( value ) { + + var title = SPEAKER_LAYOUTS[ value ]; + + layoutLabel.innerHTML = 'Layout' + ( title ? ( ': ' + title ) : '' ); + layoutDropdown.value = value; + + document.body.setAttribute( 'data-speaker-layout', value ); + + // Persist locally + if( window.localStorage ) { + window.localStorage.setItem( 'reveal-speaker-layout', value ); + } + + } + + /** + * Returns the ID of the most recently set speaker layout + * or our default layout if none has been set. + */ + function getLayout() { + + if( window.localStorage ) { + var layout = window.localStorage.getItem( 'reveal-speaker-layout' ); + if( layout ) { + return layout; + } + } + + // Default to the first record in the layouts hash + for( var id in SPEAKER_LAYOUTS ) { + return id; + } + + } + function zeroPadInteger( num ) { var str = '00' + parseInt( num ); diff --git a/plugin/notes/notes.html b/plugin/notes/notes.html index 145490a..4fda869 100644 --- a/plugin/notes/notes.html +++ b/plugin/notes/notes.html @@ -544,6 +544,10 @@ } + /** + * Returns the ID of the most recently set speaker layout + * or our default layout if none has been set. + */ function getLayout() { if( window.localStorage ) { -- cgit v1.2.3 From 1301de9e396944476fa8e5fd19f4fe5d0fee1dd7 Mon Sep 17 00:00:00 2001 From: James Roper Date: Sat, 1 Oct 2016 21:52:49 +1000 Subject: Logitech R400 on Ubuntu blackout button support On Ubuntu 16.04, the Logitech R400's blackout button gets mapped to 'v' (keyCode 86). I don't know why this is, but since nothing else is currently using 'v', this allows it to be supported out of the box. --- js/reveal.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/js/reveal.js b/js/reveal.js index 7d9a305..4a47756 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -3968,8 +3968,8 @@ // keyboard modifier key is present if( activeElementIsCE || activeElementIsInput || (event.shiftKey && event.keyCode !== 32) || event.altKey || event.ctrlKey || event.metaKey ) return; - // While paused only allow resume keyboard events; 'b', '.'' - var resumeKeyCodes = [66,190,191]; + // While paused only allow resume keyboard events; 'b', 'v', '.' + var resumeKeyCodes = [66,86,190,191]; var key; // Custom key bindings for togglePause should be able to resume @@ -4041,8 +4041,8 @@ case 32: isOverview() ? deactivateOverview() : event.shiftKey ? navigatePrev() : navigateNext(); break; // return case 13: isOverview() ? deactivateOverview() : triggered = false; break; - // two-spot, semicolon, b, period, Logitech presenter tools "black screen" button - case 58: case 59: case 66: case 190: case 191: togglePause(); break; + // two-spot, semicolon, b, v, period, Logitech presenter tools "black screen" button + case 58: case 59: case 66: case 86: case 190: case 191: togglePause(); break; // f case 70: enterFullscreen(); break; // a -- cgit v1.2.3 From ea8964ddbf7a603197fee093b206bc879ebabd33 Mon Sep 17 00:00:00 2001 From: chadmorrow Date: Fri, 30 Sep 2016 17:46:32 -0700 Subject: autoSlide duration with playbackRate The autoSlide duration of media elements with data-autoplay now takes the playbackRate of said media element into account when setting the duration so that autoSlide and the media element stay in sync.--- js/reveal.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/js/reveal.js b/js/reveal.js index 97f2994..09cc5b6 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -3767,12 +3767,13 @@ // If there are media elements with data-autoplay, // automatically set the autoSlide duration to the // length of that media. Not applicable if the slide - // is divided up into fragments. + // is divided up into fragments. + // playbackRate is accounted for in the duration. if( currentSlide.querySelectorAll( '.fragment' ).length === 0 ) { toArray( currentSlide.querySelectorAll( 'video, audio' ) ).forEach( function( el ) { if( el.hasAttribute( 'data-autoplay' ) ) { - if( autoSlide && el.duration * 1000 > autoSlide ) { - autoSlide = ( el.duration * 1000 ) + 1000; + if( autoSlide && (el.duration * 1000 / el.playbackRate ) > autoSlide ) { + autoSlide = ( el.duration * 1000 / el.playbackRate ) + 1000; } } } ); -- cgit v1.2.3 From 0b6585bd44fe86344408d9d3ab8d3c17e254738a Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Wed, 5 Oct 2016 11:23:41 +0200 Subject: prevent exception when initializing with no slides #1678 #1679 --- js/reveal.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/reveal.js b/js/reveal.js index 09cc5b6..675f5ad 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -2137,6 +2137,9 @@ // Query all horizontal slides in the deck var horizontalSlides = dom.wrapper.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR ); + // Abort if there are no slides + if( horizontalSlides.length === 0 ) return; + // If no vertical index is specified and the upcoming slide is a // stack, resume at its previous vertical index if( v === undefined && !isOverview() ) { -- cgit v1.2.3 From 969885a7dc5ec7dda0ff6b8bcb4096288f945bc0 Mon Sep 17 00:00:00 2001 From: Gerald Date: Fri, 19 Aug 2016 13:37:35 +0800 Subject: ignore delta=0 mousewheel event fix #1607 --- js/reveal.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/js/reveal.js b/js/reveal.js index 675f5ad..cc66671 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -2605,10 +2605,10 @@ * Updates the slide number div to reflect the current slide. * * The following slide number formats are available: - * "h.v": horizontal . vertical slide number (default) - * "h/v": horizontal / vertical slide number - * "c": flattened slide number - * "c/t": flattened slide number / total slides + * "h.v": horizontal . vertical slide number (default) + * "h/v": horizontal / vertical slide number + * "c": flattened slide number + * "c/t": flattened slide number / total slides */ function updateSlideNumber() { @@ -4297,7 +4297,9 @@ if( delta > 0 ) { navigateNext(); } - else { + // fix #1607: On MacBook trackpad, a `delta=0` mousewheel event + // will be triggered as soon as two fingers touch. + else if( delta < 0 ) { navigatePrev(); } -- cgit v1.2.3 From 693a370f069fe8d8a4c0ea53c47085cd96cf37fc Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Wed, 5 Oct 2016 11:36:56 +0200 Subject: remove issue comment --- js/reveal.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/js/reveal.js b/js/reveal.js index cc66671..186b438 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -4297,8 +4297,6 @@ if( delta > 0 ) { navigateNext(); } - // fix #1607: On MacBook trackpad, a `delta=0` mousewheel event - // will be triggered as soon as two fingers touch. else if( delta < 0 ) { navigatePrev(); } -- cgit v1.2.3 From 2cf00254a1a696111b0f4a48dda1cac399447193 Mon Sep 17 00:00:00 2001 From: CH Date: Wed, 5 Oct 2016 11:45:37 +0200 Subject: renamed grunt 'base' option to 'root' (#1660) * Allow slides to be served away from revealjs server location The previous 'base' option conflicts with Grunt's 'base' option. Changing it to 'root' avoids this. Further, updating to a newer Grunt allows multiple parameters to be used. therefore `grunt serve --root="." --root="pathtomyslides"` allows you to keep your slide content separate from JS/CSS and such * Live reload for relocated base * Updated packages to match origin/dev * Updated packages to match origin/dev * Ensure root is an array --- Gruntfile.js | 14 +++++++++----- package.json | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 7cea2a5..96a4f52 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,7 +1,9 @@ /* global module:false */ module.exports = function(grunt) { var port = grunt.option('port') || 8000; - var base = grunt.option('base') || '.'; + var root = grunt.option('root') || '.'; + + if (!Array.isArray(root)) root = [root]; // Project configuration grunt.initConfig({ @@ -69,6 +71,7 @@ module.exports = function(grunt) { curly: false, eqeqeq: true, immed: true, + esnext: true, latedef: true, newcap: true, noarg: true, @@ -93,11 +96,12 @@ module.exports = function(grunt) { server: { options: { port: port, - base: base, + base: root, livereload: true, open: true } - } + }, + }, zip: { @@ -126,10 +130,10 @@ module.exports = function(grunt) { tasks: 'css-core' }, html: { - files: [ '*.html'] + files: root.map(path => path + '/*.html') }, markdown: { - files: [ '*.md' ] + files: root.map(path => path + '/*.md') }, options: { livereload: true diff --git a/package.json b/package.json index 7f6f334..c96e4fd 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "socket.io": "^1.4.8" }, "devDependencies": { - "grunt": "~0.4.5", + "grunt": "~1.0.1", "grunt-autoprefixer": "~3.0.3", "grunt-contrib-connect": "~0.11.2", "grunt-contrib-cssmin": "~0.14.0", -- cgit v1.2.3 From ab33b31f0a2892852903785893a4fa68862aa73d Mon Sep 17 00:00:00 2001 From: Maarten Schroeven Date: Thu, 18 Aug 2016 10:40:56 +0200 Subject: limit text written to the status div --- js/reveal.js | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/js/reveal.js b/js/reveal.js index 186b438..b0bc935 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -554,6 +554,23 @@ } + function getStatusText(node) { + var text = ""; + if(node.nodeType === 3) { //text node + text += node.textContent; + }else { + var isAriaHidden = node.getAttribute('aria-hidden'); + var isDisplayHidden = window.getComputedStyle(node)['display'] === 'none'; + if (isAriaHidden !== 'true' && !isDisplayHidden) { + var children = node.childNodes; + for (var i = 0;i < children.length; i++) { + text += getStatusText(children[i]); + } + } + } + return text; + } + /** * Configures the presentation for printing to a static * PDF. @@ -2256,7 +2273,7 @@ } // Announce the current slide contents, for screen readers - dom.statusDiv.textContent = currentSlide.textContent; + dom.statusDiv.textContent = getStatusText(currentSlide); updateControls(); updateProgress(); @@ -3669,7 +3686,7 @@ element.classList.remove( 'current-fragment' ); // Announce the fragments one by one to the Screen Reader - dom.statusDiv.textContent = element.textContent; + dom.statusDiv.textContent = getStatusText(element); if( i === index ) { element.classList.add( 'current-fragment' ); -- cgit v1.2.3 From 7e99626b142b334d2563660d260ffa96ccf34fcf Mon Sep 17 00:00:00 2001 From: Maarten Schroeven Date: Thu, 18 Aug 2016 10:56:59 +0200 Subject: only use nodeType 1 and 3 (only relevant types) --- js/reveal.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/reveal.js b/js/reveal.js index b0bc935..e78cb8f 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -558,7 +558,7 @@ var text = ""; if(node.nodeType === 3) { //text node text += node.textContent; - }else { + }else if (node.nodeType === 1) { //element node var isAriaHidden = node.getAttribute('aria-hidden'); var isDisplayHidden = window.getComputedStyle(node)['display'] === 'none'; if (isAriaHidden !== 'true' && !isDisplayHidden) { -- cgit v1.2.3 From 02f95f4de6f7913943a69b4144ed1cf8d20e1537 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Wed, 5 Oct 2016 12:00:21 +0200 Subject: code format tweaks --- js/reveal.js | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/js/reveal.js b/js/reveal.js index e78cb8f..c749bfe 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -554,21 +554,36 @@ } - function getStatusText(node) { - var text = ""; - if(node.nodeType === 3) { //text node + /** + * Converts the given HTML element into a string of text + * that can be announced to a screen reader. Hidden + * elements are excluded. + */ + function getStatusText( node ) { + + var text = ''; + + // Text node + if( node.nodeType === 3 ) { text += node.textContent; - }else if (node.nodeType === 1) { //element node - var isAriaHidden = node.getAttribute('aria-hidden'); - var isDisplayHidden = window.getComputedStyle(node)['display'] === 'none'; - if (isAriaHidden !== 'true' && !isDisplayHidden) { - var children = node.childNodes; - for (var i = 0;i < children.length; i++) { - text += getStatusText(children[i]); - } + } + // Element node + else if( node.nodeType === 1 ) { + + var isAriaHidden = node.getAttribute( 'aria-hidden' ); + var isDisplayHidden = window.getComputedStyle( node )['display'] === 'none'; + if( isAriaHidden !== 'true' && !isDisplayHidden ) { + + toArray( node.childNodes ).forEach( function( child ) { + text += getStatusText( child ); + } ); + } + } + return text; + } /** @@ -2273,7 +2288,7 @@ } // Announce the current slide contents, for screen readers - dom.statusDiv.textContent = getStatusText(currentSlide); + dom.statusDiv.textContent = getStatusText( currentSlide ); updateControls(); updateProgress(); @@ -3686,7 +3701,7 @@ element.classList.remove( 'current-fragment' ); // Announce the fragments one by one to the Screen Reader - dom.statusDiv.textContent = getStatusText(element); + dom.statusDiv.textContent = getStatusText( element ); if( i === index ) { element.classList.add( 'current-fragment' ); -- cgit v1.2.3 From 0b9233cf4a1a53297356cbc834c2240a92d20545 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Wed, 5 Oct 2016 14:00:40 +0200 Subject: attempt at fixing ff transition bug #1627 --- css/reveal.css | 12 ++++++------ css/reveal.scss | 10 ++++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/css/reveal.css b/css/reveal.css index fae8123..c879c03 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -463,8 +463,8 @@ body { * CONVEX TRANSITION * Aliased 'default' for backwards compatibility *********************************************/ -.reveal .slides section[data-transition=default], -.reveal.default .slides section:not([data-transition]) { +.reveal .slides section[data-transition=default].stack, +.reveal.default .slides section.stack { -webkit-transform-style: preserve-3d; transform-style: preserve-3d; } @@ -492,8 +492,8 @@ body { -webkit-transform: translate3d(0, 300px, 0) rotateX(-70deg) translate3d(0, 300px, 0); transform: translate3d(0, 300px, 0) rotateX(-70deg) translate3d(0, 300px, 0); } -.reveal .slides section[data-transition=convex], -.reveal.convex .slides section:not([data-transition]) { +.reveal .slides section[data-transition=convex].stack, +.reveal.convex .slides section.stack { -webkit-transform-style: preserve-3d; transform-style: preserve-3d; } @@ -524,8 +524,8 @@ body { /********************************************* * CONCAVE TRANSITION *********************************************/ -.reveal .slides section[data-transition=concave], -.reveal.concave .slides section:not([data-transition]) { +.reveal .slides section[data-transition=concave].stack, +.reveal.concave .slides section.stack { -webkit-transform-style: preserve-3d; transform-style: preserve-3d; } diff --git a/css/reveal.scss b/css/reveal.scss index c888a27..c5ff05a 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -480,6 +480,12 @@ body { @content; } } +@mixin transition-stack($style) { + .reveal .slides section[data-transition=#{$style}].stack, + .reveal.#{$style} .slides section.stack { + @content; + } +} @mixin transition-horizontal-past($style) { .reveal .slides>section[data-transition=#{$style}].past, .reveal .slides>section[data-transition~=#{$style}-out].past, @@ -539,7 +545,7 @@ body { *********************************************/ @each $stylename in default, convex { - @include transition-global(#{$stylename}) { + @include transition-stack(#{$stylename}) { transform-style: preserve-3d; } @@ -561,7 +567,7 @@ body { * CONCAVE TRANSITION *********************************************/ -@include transition-global(concave) { +@include transition-stack(concave) { transform-style: preserve-3d; } -- cgit v1.2.3 From e76855e257d0f901c7a8a51630458f0d9dbaefcc Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Thu, 6 Oct 2016 11:01:44 +0200 Subject: remove unused dom lookup --- js/reveal.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/reveal.js b/js/reveal.js index 41000d6..861059c 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -516,7 +516,6 @@ // Cache references to elements dom.controls = document.querySelector( '.reveal .controls' ); - dom.theme = document.querySelector( '#theme' ); dom.wrapper.setAttribute( 'role', 'application' ); -- cgit v1.2.3 From 7547b893d4421c193974a9e68989cfa20669ac11 Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Mon, 10 Oct 2016 12:11:27 +0200 Subject: fixes ff overview rendering bug #1649 --- css/reveal.css | 5 ++++- css/reveal.scss | 10 ++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/css/reveal.css b/css/reveal.css index c879c03..dbabfcb 100644 --- a/css/reveal.css +++ b/css/reveal.css @@ -1001,6 +1001,8 @@ body { perspective-origin: 50% 50%; -webkit-perspective: 700px; perspective: 700px; } + .reveal.overview .slides { + -moz-transform-style: preserve-3d; } .reveal.overview .slides section { height: 100%; top: 0 !important; @@ -1028,7 +1030,8 @@ body { overflow: visible; } .reveal.overview .backgrounds { -webkit-perspective: inherit; - perspective: inherit; } + perspective: inherit; + -moz-transform-style: preserve-3d; } .reveal.overview .backgrounds .slide-background { opacity: 1; visibility: visible; diff --git a/css/reveal.scss b/css/reveal.scss index c5ff05a..f6a37ad 100644 --- a/css/reveal.scss +++ b/css/reveal.scss @@ -1028,6 +1028,12 @@ body { perspective-origin: 50% 50%; perspective: 700px; + .slides { + // Fixes overview rendering errors in FF48+, not applied to + // other browsers since it degrades performance + -moz-transform-style: preserve-3d; + } + .slides section { height: 100%; top: 0 !important; @@ -1060,6 +1066,10 @@ body { .backgrounds { perspective: inherit; + + // Fixes overview rendering errors in FF48+, not applied to + // other browsers since it degrades performance + -moz-transform-style: preserve-3d; } .backgrounds .slide-background { -- cgit v1.2.3 From ca37d4e5b906640ea2301d34d2bb8d65b9572eae Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Wed, 12 Oct 2016 13:21:22 +0200 Subject: remove debug code --- demo.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/demo.html b/demo.html index 632e8d6..36ad224 100644 --- a/demo.html +++ b/demo.html @@ -391,8 +391,6 @@ Reveal.addEventListener( 'customevent', function() { history: true, center: true, - width: 1000, - transition: 'slide', // none/fade/slide/convex/concave/zoom // More info https://github.com/hakimel/reveal.js#dependencies -- cgit v1.2.3 From 659822a8b50f501c68204e957df2d99be7693d01 Mon Sep 17 00:00:00 2001 From: christikaes Date: Sun, 30 Oct 2016 11:31:20 -0400 Subject: Hide slide number when in paper or pdf print view --- css/print/paper.css | 5 +++-- css/print/pdf.css | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/css/print/paper.css b/css/print/paper.css index 6588f48..27d19dd 100644 --- a/css/print/paper.css +++ b/css/print/paper.css @@ -38,7 +38,8 @@ .share-reveal, .state-background, .reveal .progress, - .reveal .backgrounds { + .reveal .backgrounds, + .reveal .slide-number { display: none !important; } @@ -199,4 +200,4 @@ font-size: 0.8em; } -} \ No newline at end of file +} diff --git a/css/print/pdf.css b/css/print/pdf.css index 4bfcddc..e114ca8 100644 --- a/css/print/pdf.css +++ b/css/print/pdf.css @@ -31,7 +31,8 @@ html { .reveal.overview, .fork-reveal, .share-reveal, -.state-background { +.state-background, +.reveal .slide-number { display: none !important; } -- cgit v1.2.3 From 80e28774dd52e731804a41adfe8d03bd8739851f Mon Sep 17 00:00:00 2001 From: Christi Kaes Date: Sun, 30 Oct 2016 14:11:10 -0400 Subject: Don't remove slide-number in pdf view --- css/print/pdf.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/css/print/pdf.css b/css/print/pdf.css index e114ca8..4bfcddc 100644 --- a/css/print/pdf.css +++ b/css/print/pdf.css @@ -31,8 +31,7 @@ html { .reveal.overview, .fork-reveal, .share-reveal, -.state-background, -.reveal .slide-number { +.state-background { display: none !important; } -- cgit v1.2.3 From 19188205de20c6c7e219c01482e897a880e42a7b Mon Sep 17 00:00:00 2001 From: Hakim El Hattab Date: Wed, 9 Nov 2016 11:56:55 +0100 Subject: add pdf-ready event; dispatched when the presentation is laid out and ready to print --- js/reveal.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/js/reveal.js b/js/reveal.js index 861059c..28aa400 100644 --- a/js/reveal.js +++ b/js/reveal.js @@ -714,6 +714,9 @@ fragment.classList.add( 'visible' ); } ); + // Notify subscribers that the PDF layout is good to go + dispatchEvent( 'pdf-ready' ); + } /** -- cgit v1.2.3 From 21c1fafa5271f64472a8b1668bf1f348447b7130 Mon Sep 17 00:00:00 2001 From: Spencer Mathews Date: Tue, 15 Nov 2016 13:05:43 -0800 Subject: Update README.md to reflect current defaults in js/reveal.js --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cb72f23..d31156e 100644 --- a/README.md +++ b/README.md @@ -236,13 +236,13 @@ Reveal.initialize({ previewLinks: false, // Transition style - transition: 'default', // none/fade/slide/convex/concave/zoom + transition: 'slide', // none/fade/slide/convex/concave/zoom // Transition speed transitionSpeed: 'default', // default/fast/slow // Transition style for full page slide backgrounds - backgroundTransition: 'default', // none/fade/slide/convex/concave/zoom + backgroundTransition: 'fade', // none/fade/slide/convex/concave/zoom // Number of slides away from the current that are visible viewDistance: 3, -- cgit v1.2.3 From 35162c1f5e345b88311e9238de3afb4fa3e1fa13 Mon Sep 17 00:00:00 2001 From: J.M. Cléry Date: Tue, 22 Nov 2016 23:42:21 +0100 Subject: Better version of data-trim on code snippets --- plugin/highlight/highlight.js | 49 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/plugin/highlight/highlight.js b/plugin/highlight/highlight.js index 8be8c98..6aae081 100644 --- a/plugin/highlight/highlight.js +++ b/plugin/highlight/highlight.js @@ -1,5 +1,52 @@ // START CUSTOM REVEAL.JS INTEGRATION (function() { + // Function to perform a better "data-trim" on code snippets + // Will slice an indentation amount on each line of the snippet (amount based on the line having the lowest indentation length) + function betterTrim(snippetEl) { + // Helper functions + function trimLeft(val) { + // Adapted from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/Trim#Polyfill + return val.replace(/^[\s\uFEFF\xA0]+/g, ''); + } + function trimLineBreaks(input) { + var lines = input.split('\n'); + + // Trim line-breaks from the beginning + for (var i = 0; i < lines.length; i++) { + if (lines[i].trim() === '') { + lines.splice(i--, 1); + } else break; + } + + // Trim line-breaks from the end + for (var i = lines.length-1; i >= 0; i--) { + if (lines[i].trim() === '') { + lines.splice(i, 1); + } else break; + } + + return lines.join('\n'); + } + + // Main function for betterTrim() + return (function(snippetEl) { + var content = trimLineBreaks(snippetEl.innerHTML); + var lines = content.split('\n'); + // Calculate the minimum amount to remove on each line start of the snippet (can be 0) + var pad = lines.reduce(function(acc, line) { + if (line.length > 0 && trimLeft(line).length > 0 && acc > line.length - trimLeft(line).length) { + return line.length - trimLeft(line).length; + } + return acc; + }, Number.POSITIVE_INFINITY); + // Slice each line with this amount + return lines.map(function(line, index) { + return line.slice(pad); + }) + .join('\n'); + })(snippetEl); + } + if( typeof window.addEventListener === 'function' ) { var hljs_nodes = document.querySelectorAll( 'pre code' ); @@ -8,7 +55,7 @@ // trim whitespace if data-trim attribute is present if( element.hasAttribute( 'data-trim' ) && typeof element.innerHTML.trim === 'function' ) { - element.innerHTML = element.innerHTML.trim(); + element.innerHTML = betterTrim(element); } // Now escape html unless prevented by author -- cgit v1.2.3 From 785dbddd28672f1df233f06d92320b9ca658457c Mon Sep 17 00:00:00 2001 From: Daan Michiels Date: Fri, 25 Nov 2016 12:36:57 -0600 Subject: correct copyright message to include contributors --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index faadd00..924cd89 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2016 Hakim El Hattab, http://hakim.se +Copyright (C) 2016 Hakim El Hattab, http://hakim.se, and reveal.js contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal -- cgit v1.2.3 From 03ac4a2e8ebc3b166286214bfb3bd69eb0561e34 Mon Sep 17 00:00:00 2001 From: Benjamin Tan Date: Tue, 6 Dec 2016 18:12:41 +0800 Subject: Reduce required Node.js version to 4.0.0. The development workflow can be used with Node 4+, not just Node 6. We should avoid showing warnings and errors when users are installing this package via npm/yarn. Ref. #1729, #1743. Closes #1725. --- README.md | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5abc569..b0257cc 100644 --- a/README.md +++ b/README.md @@ -929,7 +929,7 @@ Reveal.initialize({ Then: -1. Install [Node.js](http://nodejs.org/) (1.0.0 or later) +1. Install [Node.js](http://nodejs.org/) (4.0.0 or later) 2. Run ```npm install``` 3. Run ```node plugin/notes-server``` @@ -1115,7 +1115,7 @@ The core of reveal.js is very easy to install. You'll simply need to download a Some reveal.js features, like external Markdown and speaker notes, require that presentations run from a local web server. The following instructions will set up such a server as well as all of the development tasks needed to make edits to the reveal.js source code. -1. Install [Node.js](http://nodejs.org/) (1.0.0 or later) +1. Install [Node.js](http://nodejs.org/) (4.0.0 or later) 1. Clone the reveal.js repository ```sh diff --git a/package.json b/package.json index f0dcedf..7a9f185 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "url": "git://github.com/hakimel/reveal.js.git" }, "engines": { - "node": "~6.9.1" + "node": ">=4.0.0" }, "dependencies": { "express": "~4.14.0", -- cgit v1.2.3 From 90b301d0a03b8b23ce755c31ec6dac15cf69dc49 Mon Sep 17 00:00:00 2001 From: Benjamin Tan Date: Thu, 8 Dec 2016 17:41:55 +0800 Subject: Enable passing options for parsing Markdown. Closes #1163, #1495. --- README.md | 12 ++++++++++++ plugin/markdown/markdown.js | 32 +++++++++++++++++++------------- test/test-markdown-options.html | 41 +++++++++++++++++++++++++++++++++++++++++ test/test-markdown-options.js | 26 ++++++++++++++++++++++++++ test/test-markdown.html | 2 +- 5 files changed, 99 insertions(+), 14 deletions(-) create mode 100644 test/test-markdown-options.html create mode 100644 test/test-markdown-options.js diff --git a/README.md b/README.md index b0257cc..1c55623 100644 --- a/README.md +++ b/README.md @@ -160,6 +160,18 @@ Special syntax (in html comment) is available for adding attributes to the slide