From 96ad922e764fb97e555700f5db7defba50052c5d Mon Sep 17 00:00:00 2001
From: ant <anthonyjones@zipcoder3.local>
Date: Thu, 25 May 2017 08:31:59 -0400
Subject: [PATCH 1/2] Finished lab3

---
 index.html   |  4 ++--
 js/script.js | 36 +++++++++++++++++++++++++++++-------
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/index.html b/index.html
index ef273b7..8ffcf4e 100755
--- a/index.html
+++ b/index.html
@@ -20,8 +20,8 @@ <h1>Loops Exercises</h1>
 
     <section id="menu">
       <ul>
-        <li><button type="button" class="btn btn-primary" onclick="yourFunctionName()">Example 3.1</button></li>
-        <li><button type="button" class="btn btn-primary" onclick="yourFunctionName()">Example 3.2</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="assignment1()">Example 3.1</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="assignment2()">Example 3.2</button></li>
       </ul>
     </section>
 
diff --git a/js/script.js b/js/script.js
index c36bf4a..411d113 100755
--- a/js/script.js
+++ b/js/script.js
@@ -2,12 +2,34 @@
 
 var display = document.getElementById("display");
 
-function yourFunctionName (){
-  display.innerHTML = "hello";
+
+function assignment1() {
+
+    var characters = ["a", "b", "c"];
+    var numbers = [1, 2, 3];
+    var newFilledArray = [];
+
+    for (var i = 0; i < characters.length; i++) {
+        newFilledArray.push(characters[i]);
+        newFilledArray.push(numbers[i]);
+    }
+    display.innerHTML = newFilledArray;
 }
 
-function example(){
-  var v = 3 +4;
-  
-  display.innerHTML = v;
-}
\ No newline at end of file
+function assignment2() {
+    var numbers = new Array(50, 9, 2, 1, );
+    var numCatcher = "";
+    var numHolder = 1;
+    for (var i = 0; i < 1000; i++) {
+        var c = Math.floor(Math.random() * numbers.length);
+        var index = numbers.indexOf(c);
+        var a = numbers.splice(c, 1);
+        numbers.unshift(a)
+        var sark = numbers.join("");
+        if (parseInt(sark) > numHolder) {
+            numHolder = parseInt(sark);
+            numHolder.toString;
+        }
+    }
+    display.innerHTML = "An array of numbers which contains 50, 9, 2 and 1, the largest number you can generate is <br>"+numHolder;
+}

From a8b5c6c2b5631ac789680572b4942ad60275b44c Mon Sep 17 00:00:00 2001
From: ant <anthonyjones@zipcoder3.local>
Date: Thu, 25 May 2017 10:14:20 -0400
Subject: [PATCH 2/2] Cleaned up lab3

---
 index.html   |  2 +-
 js/script.js | 30 ++++++++++++++++++------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/index.html b/index.html
index 8ffcf4e..48745a9 100755
--- a/index.html
+++ b/index.html
@@ -21,7 +21,7 @@ <h1>Loops Exercises</h1>
     <section id="menu">
       <ul>
         <li><button type="button" class="btn btn-primary" onclick="assignment1()">Example 3.1</button></li>
-        <li><button type="button" class="btn btn-primary" onclick="assignment2()">Example 3.2</button></li>
+        <li><button type="button" class="btn btn-primary" onclick="adder()">Example 3.2</button></li>
       </ul>
     </section>
 
diff --git a/js/script.js b/js/script.js
index 411d113..cf4623c 100755
--- a/js/script.js
+++ b/js/script.js
@@ -2,13 +2,11 @@
 
 var display = document.getElementById("display");
 
-
 function assignment1() {
 
     var characters = ["a", "b", "c"];
     var numbers = [1, 2, 3];
     var newFilledArray = [];
-
     for (var i = 0; i < characters.length; i++) {
         newFilledArray.push(characters[i]);
         newFilledArray.push(numbers[i]);
@@ -16,20 +14,28 @@ function assignment1() {
     display.innerHTML = newFilledArray;
 }
 
-function assignment2() {
-    var numbers = new Array(50, 9, 2, 1, );
+function adder(){
+    
+    var numbers = prompt("Add any amount of numbers separated by commas");
+    
+    assignment2(numbers.split(","));
+}
+
+function assignment2(numbers) {
+   // var numbers = Array(50, 9, 2, 1);
     var numCatcher = "";
     var numHolder = 1;
     for (var i = 0; i < 1000; i++) {
-        var c = Math.floor(Math.random() * numbers.length);
-        var index = numbers.indexOf(c);
-        var a = numbers.splice(c, 1);
-        numbers.unshift(a)
-        var sark = numbers.join("");
-        if (parseInt(sark) > numHolder) {
-            numHolder = parseInt(sark);
+        var randomNumber = Math.floor(Math.random() * numbers.length);
+        var index = numbers.indexOf(randomNumber);
+        var splicedNumber = numbers.splice(randomNumber, 1);
+        numbers.unshift(splicedNumber)
+        var joinNumber = numbers.join("");
+        if (parseInt(joinNumber) > numHolder) {
+            numHolder = parseInt(joinNumber);
             numHolder.toString;
         }
     }
-    display.innerHTML = "An array of numbers which contains 50, 9, 2 and 1, the largest number you can generate is <br>"+numHolder;
+   display.innerHTML = "An array of numbers which contains "+ numbers+ ". The largest number you can generate is: <br>" + numHolder;
+    // display.innerHTML = numHolder;
 }