Parcourir la source

cleanup & comments

Hakim El Hattab il y a 12 ans
Parent
commit
233160ff23
2 fichiers modifiés avec 13 ajouts et 32 suppressions
  1. 4 22
      index.html
  2. 9 10
      js/reveal.js

+ 4 - 22
index.html

@@ -100,7 +100,8 @@
 			
 			<section>
 				<h2>Pretty Code</h2>
-				<pre><code>var supports3DTransforms =  document.body.style['webkitPerspective'] !== undefined || 
+				<pre><code>
+var supports3DTransforms =  document.body.style['webkitPerspective'] !== undefined || 
 				document.body.style['MozPerspective'] !== undefined ||
 				document.body.style['perspective'] !== undefined;
 
@@ -120,7 +121,8 @@ function linkify( selector ) {
     }
 }
 
-linkify( 'a' );</code></pre>
+linkify( 'a' );
+				</code></pre>
 				<p>Courtesy of <a href="http://softwaremaniacs.org/soft/highlight/en/description/">highlight.js</a>.</p>
 			</section>
 			
@@ -191,25 +193,5 @@ linkify( 'a' );</code></pre>
 		</script>
 		
 		
-		
-		<!-- Everything below this point is unrelated to the slideshow -->
-		
-		<div style="position: absolute; bottom: 10px; left: 50%; margin-left: -95px">
-			<a href="http://twitter.com/share" class="twitter-share-button" data-text="reveal.js - a 3D slideshow tool from @hakimel." data-url="http://lab.hakim.se/reveal-js" data-count="small" data-related="hakimel"></a>
-			<iframe id="facebook-button" src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fapp.hakim.se%2Freveal-js%2F&layout=button_count&show_faces=false&width=90&action=like&font=arial&colorscheme=light&height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:85px; height:24px; position: relative; top: 4px;" allowTransparency="true"></iframe> 
-			<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
-		</div>
-		
-		<script>
-		var _gaq = [['_setAccount', 'UA-15240703-1'], ['_trackPageview']];
-		(function(d, t) {
-		var g = d.createElement(t),
-		    s = d.getElementsByTagName(t)[0];
-		g.async = true;
-		g.src = ('https:' == location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-		s.parentNode.insertBefore(g, s);
-		})(document, 'script');
-		</script>
-		
 	</body>
 </html>

+ 9 - 10
js/reveal.js

@@ -25,9 +25,7 @@
  * sexy CSS 3D transforms.
  * 
  * Slides are given unique hash based URL's so that they can be 
- * opened directly. I didn't use the HTML5 History API for this 
- * as it would have required the addition of server side rewrite 
- * rules and hence require more effort for anyone to set up.
+ * opened directly.
  * 
  * Public facing methods:
  * - Reveal.initialize( { ... options ... } );
@@ -48,9 +46,7 @@
  * 
  * version 0.3:		
  * - Added licensing terms
- * 
- * version 0.4:
- * - Fixed broken links on touch devices.
+ * - Fixed broken links on touch devices
  * 
  * version 1.0:
  * - Added controls
@@ -63,15 +59,16 @@
  * 
  * TODO:
  * - Touch/swipe interactions
+ * - Presentation overview via keyboard shortcut
  * 	
- * @author Hakim El Hattab
+ * @author Hakim El Hattab | http://hakim.se
  * @version 1.0
  */
 var Reveal = (function(){
 	
 	var HORIZONTAL_SLIDES_SELECTOR = '#main>section',
 		VERTICAL_SLIDES_SELECTOR = 'section.present>section',
-		
+
 		indexh = 0,
 		indexv = 0,
 
@@ -98,7 +95,7 @@ var Reveal = (function(){
 		dom.controlsUp.addEventListener('click', preventAndForward( navigateUp ), false);
 		dom.controlsDown.addEventListener('click', preventAndForward( navigateDown ), false);
 
-		// Set default configuration
+		// Default options
 		config.rollingLinks = options.rollingLinks === undefined ? true : options.rollingLinks;
 		config.controls = options.controls === undefined ? false : options.controls;
 		config.theme = options.theme === undefined ? 'default' : options.theme;
@@ -116,7 +113,7 @@ var Reveal = (function(){
 			linkify();
 		}
 
-		// Read the initial state of the URL (hash)
+		// Read the initial hash
 		readURL();
 	}
 
@@ -310,7 +307,9 @@ var Reveal = (function(){
 	}
 
 	/**
+	 * Determine what available routes there are for navigation.
 	 * 
+	 * @return {Object} containing four booleans: left/right/up/down
 	 */
 	function availableRoutes() {
 		var horizontalSlides = document.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR );