From dc3d0803f7f09eaf3844b8a2fe2be72b1acdafb5 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 25 May 2017 09:22:24 -0400 Subject: [PATCH 1/2] Gitignore --- .gitignore | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5309019..ad6f559 100755 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,16 @@ .Spotlight-V100 .Trashes ehthumbs.db -Thumbs.db \ No newline at end of file +Thumbs.db + +# Intellij +.idea/ +*.iml +*.iws + +# Mac +.DS_Store + +# Maven +log/ +target/ From 4242b0ecb97e8041aae1441111f366d87182f58a Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 25 May 2017 10:09:14 -0400 Subject: [PATCH 2/2] Done --- index.html | 4 ++-- js/script.js | 21 +++++++++++++++------ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/index.html b/index.html index ef273b7..0e6698f 100755 --- a/index.html +++ b/index.html @@ -20,8 +20,8 @@

Loops Exercises

diff --git a/js/script.js b/js/script.js index c36bf4a..56ec968 100755 --- a/js/script.js +++ b/js/script.js @@ -2,12 +2,21 @@ var display = document.getElementById("display"); -function yourFunctionName (){ - display.innerHTML = "hello"; +function combineArrays(letters, numbers) { + let combined = []; + for (let i = 0; i < letters.length; i++) { + combined.push(letters[i]); + combined.push(numbers[i]); + } + + display.innerHTML = "[" + combined + "]
"; } -function example(){ - var v = 3 +4; - - display.innerHTML = v; +function largeNumber(someNumbers) { + someNumbers = someNumbers.sort().reverse(); + let result = ""; + for(let i = 0; i < someNumbers.length; i++){ + result += someNumbers[i]; + } + display.innerHTML = result; } \ No newline at end of file