From 183845c61ca0f9beebea7b945a24b3b1e32edf03 Mon Sep 17 00:00:00 2001 From: Dan Zygmund-Felt Date: Wed, 24 May 2017 17:01:13 -0400 Subject: [PATCH 1/2] Most functions implemented. First commit, though. --- index.html | 18 ++++----- js/script.js | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 9 deletions(-) diff --git a/index.html b/index.html index b16c318..b37a258 100644 --- a/index.html +++ b/index.html @@ -20,16 +20,16 @@

Loops Exercises

diff --git a/js/script.js b/js/script.js index ba8cf69..63a8597 100644 --- a/js/script.js +++ b/js/script.js @@ -5,3 +5,105 @@ var display = document.getElementById("display"); function yourFunctionName (){ display.innerHTML = "hello"; } + +function oneToTen() { + var retString = "" + for(i = 1; i < 11; i++) { + retString += i + "
" + } + display.innerHTML = retString +}; + +function oddNumbers() { + var retString = "" + for(i = 0; i < 10; i++) { + retString += (2*i + 1) + "
" + } + display.innerHTML = retString +}; + +function squares() { + var retString = "" + for(i = 1; i < 11; i++) { + retString += (i*i) + "
" + } + display.innerHTML = retString +}; + +function random4() { + var retString = "" + for(i = 0; i < 4; i++) { + retString += Math.round(100*Math.random()) + "
" + } + display.innerHTML = retString +} + +function even(n) { + var retString = "" + if(n % 2 !== 0) { + n++; + } + for(i = 2; i < n; i+=2) { + retString += i + "
" + } + display.innerHTML = retString +} + +function powers(n) { + var retString = "" + for(i = 1; i <= n; i++) { + retString += Math.pow(2, i) + "
" + } + display.innerHTML = retString +} + +function areWeThereYet() { + //stubbed +} + +function triangle() { + var retString = "" + for(i = 1; i < 6; i++) { + for(j = 0; j < i; j++) { + retString += "/*" + } + retString += "
" + } + display.innerHTML = retString +} + +function tableSquare() { + var retString = "" + for(i = 1; i < 5; i++) { + for(j = 0; j < 4; j++) { + retString += "|" + (i + i*j); + } + retString += "|
" + } + display.innerHTML = retString +} + +function tableSquares(n) { + var retString = "" + for(i = 1; i < n+1; i++) { + for(j = 0; j < n; j++) { + retString += "|" + (i + i*j); + } + retString += "|
" + } + display.innerHTML = retString +} + + + + + + + + + + + + + + From e714923a47a8d7470e6042e01881ce6b95dff4a4 Mon Sep 17 00:00:00 2001 From: Dan Zygmund-Felt Date: Wed, 24 May 2017 17:10:49 -0400 Subject: [PATCH 2/2] Finished. --- index.html | 2 +- js/script.js | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index b37a258..48fb893 100644 --- a/index.html +++ b/index.html @@ -26,7 +26,7 @@

Loops Exercises

  • -
  • +
  • diff --git a/js/script.js b/js/script.js index 63a8597..9a40fbc 100644 --- a/js/script.js +++ b/js/script.js @@ -58,7 +58,15 @@ function powers(n) { } function areWeThereYet() { - //stubbed + var retString = "" + var answer = "" + while(answer !== "Yes") { + retString += "Arewethereyet?
    " + answer = prompt("Arewethereyet?") + retString += answer + "
    " + } + retString += "Good!" + display.innerHTML = retString } function triangle() {