Permalink
Browse files

merge

  • Loading branch information...
2 parents f20d16b + a5fed3f commit ee22687b86cd4f4ada450b2e3430bed821a296fe Juha Paananen committed Jan 13, 2012
Showing with 33 additions and 2 deletions.
  1. +1 −1 README.md
  2. +31 −0 index.html
  3. +1 −1 presentation.js
View
@@ -35,4 +35,4 @@ published [here](http://eea.kapsi.fi/RXJS/).
- [Reaktor](http://www.reaktor.fi/en) uses for both internal and external projects
- [validation.js](http://github.com/reaktor/validation.js)
-- [Worzone](http://juhajasatu.com/worzone) the game
+- [Worzone](http://juhajasatu.com/worzone) the game
View
@@ -0,0 +1,31 @@
+<html>
+<head>
+ <script type="text/javascript" src="lib/jquery.js"></script>
+ <script type="text/javascript" src="lib/underscore.js"></script>
+ <script type="text/javascript" src="lib/rx.js"></script>
+ <script type="text/javascript" src="lib/rx.jQuery.js"></script>
+ <script type="text/javascript" src="lib/raphael.js"></script>
+ <script type="text/javascript" src="lib/vector.js"></script>
+ <script type="text/javascript" src="lib/prettify.js"></script>
+ <script type="text/javascript" src="presentation.js"></script>
+ <script type="text/javascript" src="keystate.js"></script>
+ <script type="text/javascript">
+ $(function() { initPresentation(0) })
+ </script>
+ <link href="devday-rx.css" rel="stylesheet" type="text/css"/>
+</head>
+<body>
+ <div id="slide">
+ <h1>Rx for Javascript</h1>
+ <h5>Juha Paananen / Reaktor DevDay 2011-09-02</h5>
+ <h5>READ INSTRUCTIONS BELOW</h5>
+ <ul>
+ <li>. = next slide
+ <li>, = previous slide
+ <li>0 = first slide
+ <li>space = next bullet
+ <li><blink>|</blink>
+ </ul>
+ </div>
+</body>
+</html><html>
View
@@ -1,4 +1,4 @@
-var slides = ['intro.html', '0.html', '1.html', '2.html', '3.html', '4.html'
+var slides = ['index.html', 'intro.html', '0.html', '1.html', '2.html', '3.html', '4.html'
, '5.html', '6.html', 'presentation.html', 'outro.html']
function initPresentation(id) {

0 comments on commit ee22687

Please sign in to comment.