From 4a0d9399628ed046b3b967c357fdab01f4792d9d Mon Sep 17 00:00:00 2001
From: hakimel
Date: Mon, 21 Jan 2013 14:55:45 -0500
Subject: don't convert anchors with child nodes to rolling links (closes #266)

---
 js/reveal.js | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'js/reveal.js')

diff --git a/js/reveal.js b/js/reveal.js
index b3d1d7f..542edc2 100644
--- a/js/reveal.js
+++ b/js/reveal.js
@@ -527,14 +527,14 @@ var Reveal = (function(){
 			for( var i = 0, len = nodes.length; i < len; i++ ) {
 				var node = nodes[i];
 
-				if( node.textContent && !node.querySelector( 'img' ) && ( !node.className || !node.classList.contains( node, 'roll' ) ) ) {
-                    var span = document.createElement('span');
-                    span.setAttribute('data-title', node.text);
-                    span.innerHTML = node.innerHTML;
+				if( node.textContent && !node.querySelector( '*' ) && ( !node.className || !node.classList.contains( node, 'roll' ) ) ) {
+					var span = document.createElement('span');
+					span.setAttribute('data-title', node.text);
+					span.innerHTML = node.innerHTML;
 
 					node.classList.add( 'roll' );
-                    node.innerHTML = '';
-                    node.appendChild(span);
+					node.innerHTML = '';
+					node.appendChild(span);
 				}
 			}
 		}
@@ -964,20 +964,20 @@ var Reveal = (function(){
 		if( previousSlide ) {
 			previousSlide.classList.remove( 'present' );
 
-            // Reset all slides upon navigate to home
-            // Issue: #285
-            if ( document.querySelector( HOME_SLIDE_SELECTOR ).classList.contains( 'present' ) ) {
-                // Launch async task
-                setTimeout( function () {
-                    var slides = toArray( document.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR + '.stack') ), i;
-                    for( i in slides ) {
-                        if( slides[i] ) {
-                            // Reset stack
-                            setPreviousVerticalIndex( slides[i], 0 );
-                        }
-                    }
-                }, 0 );
-            }
+			// Reset all slides upon navigate to home
+			// Issue: #285
+			if ( document.querySelector( HOME_SLIDE_SELECTOR ).classList.contains( 'present' ) ) {
+				// Launch async task
+				setTimeout( function () {
+					var slides = toArray( document.querySelectorAll( HORIZONTAL_SLIDES_SELECTOR + '.stack') ), i;
+					for( i in slides ) {
+						if( slides[i] ) {
+							// Reset stack
+							setPreviousVerticalIndex( slides[i], 0 );
+						}
+					}
+				}, 0 );
+			}
 		}
 
 		updateControls();
-- 
cgit v1.2.3