From a0420c1b2c42a084f2ec079ef10c957c84e4c0af Mon Sep 17 00:00:00 2001
From: Sarah Zephir-Thomason <sarahzt22@gmail.com>
Date: Mon, 30 Mar 2015 17:22:44 -0700
Subject: [PATCH] Bug fixes

---
 index.html | 53 +++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 16 deletions(-)

diff --git a/index.html b/index.html
index b3625db..b7a5b6f 100644
--- a/index.html
+++ b/index.html
@@ -25,29 +25,50 @@
 
 	<script>
 
-		var words = ["fun", "exciting", "about not giving up", "being helpful", "being open", "what I learned at CodingDojo!"],
-			el = document.getElementById('magic'),
-			word_counter = 0,
-			character_counter = 0;
-
-		function updateText()
+		// wrap variable definitions in immediate function
+		(function()
 		{
-			el.innerHTML = el.innerHTML+words[word_counter][character_counter++];
+			var words = ["fun", "exciting", "about not giving up", "being helpful", "being open", "what I learned at CodingDojo!"],
+				el = document.getElementById('magic'),
+				word_counter = 0,
+				character_counter = 0;
 
-			if(character_counter == words[word_counter].length)
+			function updateText()
 			{
-				word_counter++; 	//choose a different word
-				character_counter = 0;	//start over with the first character of the word
-				el.innerHTML = '';  //set the html to be blank
+				// if a space is encountered, add a blank space and increment counter
+				if(words[word_counter][character_counter] == ' ')
+				{
+					el.innerHTML += '&nbsp;';
+	
+					character_counter++;
+				}
+				else
+				{
+					// else, preceed as usual
+					el.innerHTML = el.innerHTML+words[word_counter][character_counter++];
+				}
+		
+				// added 1 to length so we don't switch words before displaying final character in phrase
+				if(character_counter == words[word_counter].length + 1)
+				{
+					// choose a different word
+					word_counter++; 	
+					// start over with the first character of the word
+					character_counter = 0;	
+					// set the html to be blank
+					el.innerHTML = '';  
 
-				//if we're displaying the last word, go back to the first word
-				if(word_counter == words.length)
-					word_counter = 0;
+					// if we're displaying the last word, go back to the first word
+					if(word_counter == words.length)
+						word_counter = 0;
+				}
 			}
-		}
 
-		setInterval(updateText,300);
+			setInterval(updateText,300);
+
+		}());
 
+		
 	</script>
 
 </body>