File tree Expand file tree Collapse file tree 4 files changed +26
-18
lines changed Expand file tree Collapse file tree 4 files changed +26
-18
lines changed Original file line number Diff line number Diff line change 11{
22 "name" : " spectacle" ,
3- "version" : " 1.0.0-rc7 " ,
3+ "version" : " 1.0.0" ,
44 "description" : " ReactJS Powered Presentation Framework" ,
55 "main" : " lib/index.js" ,
66 "scripts" : {
Original file line number Diff line number Diff line change 88
99import preloader from "../src/utils/preloader" ;
1010
11+ import createTheme from "../src/themes/default" ;
12+
1113import Interactive from "../assets/interactive" ;
1214
1315require ( "normalize.css" ) ;
@@ -20,10 +22,16 @@ const images = {
2022 markdown : require ( "../assets/markdown.png" )
2123} ;
2224
25+ preloader ( images ) ;
26+
27+ const theme = createTheme ( {
28+ primary : "#ff4081"
29+ } ) ;
30+
2331export default class Presentation extends React . Component {
2432 render ( ) {
2533 return (
26- < Spectacle >
34+ < Spectacle theme = { theme } >
2735 < Deck transition = { [ "zoom" , "slide" ] } transitionDuration = { 500 } >
2836 < Slide transition = { [ "zoom" ] } bgColor = "primary" >
2937 < Heading size = { 1 } fit caps lineHeight = { 1 } textColor = "black" >
@@ -42,7 +50,7 @@ export default class Presentation extends React.Component {
4250 </ Slide >
4351 < Slide transition = { [ "slide" ] } bgColor = "black" notes = "You can even put notes on your slide. How awesome is that?" >
4452 < Image src = { images . kat . replace ( "/" , "" ) } margin = "0px auto 40px" height = "293px" />
45- < Heading size = { 1 } fit textColor = "primary" textFont = "secondary " >
53+ < Heading size = { 2 } caps fit textColor = "primary" textFont = "primary " >
4654 Wait what?
4755 </ Heading >
4856 </ Slide >
Original file line number Diff line number Diff line change @@ -75,28 +75,28 @@ export default class Deck extends Component {
7575 window . removeEventListener ( "storage" , this . _goToSlide ) ;
7676 window . removeEventListener ( "keydown" , this . _handleKeyPress ) ;
7777 }
78- _handleKeyPress ( e ) {
78+ _handleEvent ( e ) {
7979 const event = window . event ? window . event : e ;
8080
81- if ( event . target instanceof HTMLInputElement || event . target . type === "textarea" ) {
82- return ;
83- }
84-
85- // left, page down
8681 if ( event . keyCode === 37 || event . keyCode === 33 || ( event . keyCode === 32 && event . shiftKey ) ) {
8782 this . _prevSlide ( ) ;
88- }
89- // right, page up
90- if ( event . keyCode === 39 || event . keyCode === 34 || ( event . keyCode === 32 && ! event . shiftKey ) ) {
83+ } else if ( event . keyCode === 39 || event . keyCode === 34 || ( event . keyCode === 32 && ! event . shiftKey ) ) {
9184 this . _nextSlide ( ) ;
92- }
93- if ( ( event . altKey && event . keyCode === 79 ) && ! event . ctrlKey && ! event . metaKey ) { // o
85+ } else if ( ( event . altKey && event . keyCode === 79 ) && ! event . ctrlKey && ! event . metaKey ) { // o
9486 this . _toggleOverviewMode ( ) ;
95- }
96- if ( ( event . altKey && event . keyCode === 80 ) && ! event . ctrlKey && ! event . metaKey ) { // p
87+ } else if ( ( event . altKey && event . keyCode === 80 ) && ! event . ctrlKey && ! event . metaKey ) { // p
9788 this . _togglePresenterMode ( ) ;
9889 }
9990 }
91+ _handleKeyPress ( e ) {
92+ const event = window . event ? window . event : e ;
93+
94+ if ( event . target instanceof HTMLInputElement || event . target . type === "textarea" ) {
95+ return ;
96+ }
97+
98+ this . _handleEvent ( e ) ;
99+ }
100100 _toggleOverviewMode ( ) {
101101 const suffix = this . props . route . params . indexOf ( "overview" ) !== - 1 ? "" : "?overview" ;
102102 this . context . history . replaceState ( null , `/${ this . props . route . slide } ${ suffix } ` ) ;
Original file line number Diff line number Diff line change @@ -2,8 +2,8 @@ import screen from "./screen";
22import print from "./print" ;
33
44const styles = ( colors , fonts ) => ( {
5- screen : screen . call ( colors , fonts ) ,
6- print : print . call ( )
5+ screen : screen ( colors , fonts ) ,
6+ print : print ( )
77} ) ;
88
99export default styles ;
You can’t perform that action at this time.
0 commit comments