Merge branch 'davidbanham-master' into dev
This commit is contained in:
commit
562d3b0238
|
@ -1,6 +1,8 @@
|
||||||
/* global module:false */
|
/* global module:false */
|
||||||
module.exports = function(grunt) {
|
module.exports = function(grunt) {
|
||||||
var port = grunt.option('port') || 8000;
|
var port = grunt.option('port') || 8000;
|
||||||
|
var base = grunt.option('base') || '.';
|
||||||
|
|
||||||
// Project configuration
|
// Project configuration
|
||||||
grunt.initConfig({
|
grunt.initConfig({
|
||||||
pkg: grunt.file.readJSON('package.json'),
|
pkg: grunt.file.readJSON('package.json'),
|
||||||
|
@ -91,7 +93,7 @@ module.exports = function(grunt) {
|
||||||
server: {
|
server: {
|
||||||
options: {
|
options: {
|
||||||
port: port,
|
port: port,
|
||||||
base: '.',
|
base: base,
|
||||||
livereload: true,
|
livereload: true,
|
||||||
open: true
|
open: true
|
||||||
}
|
}
|
||||||
|
|
|
@ -174,7 +174,7 @@ Reveal.initialize({
|
||||||
parallaxBackgroundImage: '', // e.g. "'https://s3.amazonaws.com/hakim-static/reveal-js/reveal-parallax-1.jpg'"
|
parallaxBackgroundImage: '', // e.g. "'https://s3.amazonaws.com/hakim-static/reveal-js/reveal-parallax-1.jpg'"
|
||||||
|
|
||||||
// Parallax background size
|
// Parallax background size
|
||||||
parallaxBackgroundSize: '' // CSS syntax, e.g. "2100px 900px"
|
parallaxBackgroundSize: '', // CSS syntax, e.g. "2100px 900px"
|
||||||
|
|
||||||
// Amount to move parallax background (horizontal and vertical) on slide change
|
// Amount to move parallax background (horizontal and vertical) on slide change
|
||||||
// Number, e.g. 100
|
// Number, e.g. 100
|
||||||
|
@ -692,7 +692,7 @@ Reveal.initialize({
|
||||||
|
|
||||||
## PDF Export
|
## PDF Export
|
||||||
|
|
||||||
Presentations can be exported to PDF via a special print stylesheet. This feature requires that you use [Google Chrome](http://google.com/chrome).
|
Presentations can be exported to PDF via a special print stylesheet. This feature requires that you use [Google Chrome](http://google.com/chrome) or [Chromium](https://www.chromium.org/Home).
|
||||||
Here's an example of an exported presentation that's been uploaded to SlideShare: http://www.slideshare.net/hakimel/revealjs-300.
|
Here's an example of an exported presentation that's been uploaded to SlideShare: http://www.slideshare.net/hakimel/revealjs-300.
|
||||||
|
|
||||||
1. Open your presentation with `print-pdf` included anywhere in the query string. This triggers the default index HTML to load the PDF print stylesheet ([css/print/pdf.css](https://github.com/hakimel/reveal.js/blob/master/css/print/pdf.css)). You can test this with [lab.hakim.se/reveal-js?print-pdf](http://lab.hakim.se/reveal-js?print-pdf).
|
1. Open your presentation with `print-pdf` included anywhere in the query string. This triggers the default index HTML to load the PDF print stylesheet ([css/print/pdf.css](https://github.com/hakimel/reveal.js/blob/master/css/print/pdf.css)). You can test this with [lab.hakim.se/reveal-js?print-pdf](http://lab.hakim.se/reveal-js?print-pdf).
|
||||||
|
@ -712,7 +712,7 @@ The framework comes with a few different themes included:
|
||||||
- white: White background, black text, blue links
|
- white: White background, black text, blue links
|
||||||
- league: Gray background, white text, blue links (default theme for reveal.js < 3.0.0)
|
- league: Gray background, white text, blue links (default theme for reveal.js < 3.0.0)
|
||||||
- beige: Beige background, dark text, brown links
|
- beige: Beige background, dark text, brown links
|
||||||
- sky: Blue background, thin white text, blue links
|
- sky: Blue background, thin dark text, blue links
|
||||||
- night: Black background, thick white text, orange links
|
- night: Black background, thick white text, orange links
|
||||||
- serif: Cappuccino background, gray text, brown links
|
- serif: Cappuccino background, gray text, brown links
|
||||||
- simple: White background, black text, blue links
|
- simple: White background, black text, blue links
|
||||||
|
|
11
js/reveal.js
11
js/reveal.js
|
@ -3764,8 +3764,15 @@
|
||||||
// keyboard modifier key is present
|
// keyboard modifier key is present
|
||||||
if( activeElementIsCE || activeElementIsInput || (event.shiftKey && event.keyCode !== 32) || event.altKey || event.ctrlKey || event.metaKey ) return;
|
if( activeElementIsCE || activeElementIsInput || (event.shiftKey && event.keyCode !== 32) || event.altKey || event.ctrlKey || event.metaKey ) return;
|
||||||
|
|
||||||
// While paused only allow "unpausing" keyboard events (b and .)
|
// While paused only allow resume keyboard events;
|
||||||
if( isPaused() && [66,190,191].indexOf( event.keyCode ) === -1 ) {
|
// 'b', '.' or any key specifically mapped to togglePause
|
||||||
|
var resumeKeyCodes = [66,190,191].concat( Object.keys( config.keyboard ).map( function( key ) {
|
||||||
|
if( config.keyboard[key] === 'togglePause' ) {
|
||||||
|
return parseInt( key, 10 );
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
|
||||||
|
if( isPaused() && resumeKeyCodes.indexOf( event.keyCode ) === -1 ) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue