Merge pull request #1 from RichardJamesWard/Update

Update

Author: RichardJamesWard

js/script.js

@@ -1,7 +1,7 @@
 
-// inspirational quotes stored as mutliple strings within an array
+//Object Array to hold quotes, sources, citaitons and years
 var quotes = [
-{
+{
 quote: "Be who you are and say what you feel, because those who mind don't matter and those who matter don't mind.",
 source: "Dr. Seuss"
 },
@@ -161,44 +161,50 @@ var quotes = [
 quote: "We are what we repeatedly do. Excellence, then, is not an act, but a habit.",
 source: "Aristotle"
 }
-
 ];
 
-//Function to select a random quote object from the quotes array & return the randomly selected quote value
+//Function to randomly select a quote value and return a random quote object from the quotes array
 function getRandomQuote () {
-var randomQuote = Math.floor(Math.random() * (quotes.length));
-return randomQuote
-}
+var randomNumber = Math.floor(Math.random() * (quotes.length));
+var randomQuote = quotes[randomNumber];
+return randomQuote;
+}
 
 //Function to select random rgb color value
 function getRandomColor () {
-var randomColor;
 var red = Math.floor(Math.random() * 256 );
 var green = Math.floor(Math.random() * 256 );
 var blue = Math.floor(Math.random() * 256 );
-randomColor = 'rgb(' + red + ',' + green + ',' + blue + ')';
+ var randomColor = 'rgb(' + red + ',' + green + ',' + blue + ')';
 return randomColor;
 }
 
 //Function to call the getRandomQuote function and stores the returned quote object in a variable
 //Constructs a string containing the different properties of the quote object 
 function printQuote () {
+var quotes = getRandomQuote ();
 var quoteContainer = document.getElementById("quote-box");
-var selectQuote = getRandomQuote ();
-var quoteString = '<p class="quote">'+quotes[selectQuote].quote +'</p><p class="source">'+ quotes[selectQuote].source;
-if (quotes[selectQuote].citation) {quoteString += '<span class="citation">' + quotes[selectQuote].citation +'</span>';}
-if (quotes[selectQuote].year) {quoteString += '<span class="year">' + quotes[selectQuote].year +'</span></p>';}
+var quoteString = `<p class="quote">${quotes.quote}</p><p class="source">${quotes.source}`;
+if (quotes.citation) {quoteString += `<span class="citation">${quotes.citation}</span>`}
+if (quotes.year) {quoteString += `<span class="year">${quotes.year}</span></p>`}
 else {quoteString += '</p>'};
 quoteContainer.innerHTML = quoteString;
 
 //assigns random color value to document background color 
 document.body.style.backgroundColor = getRandomColor ();
-}
+}
+
+//Quote automatically refreshes every 15 seconds
+window.setInterval(function(){
+printQuote ();
+}, 15000);
 
 //Event listener on LoadQuote button to generate new quote
 document.getElementById("loadQuote").addEventListener("click", printQuote, false);
 
 
 
 
-
+
+
+