From 1fd30ee9004c78c0bd253ac422ae2040fc95675a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 30 Jun 2020 15:17:07 -0400 Subject: [PATCH 1/7] pushing slides 22 and 23; both in separate HTMLl files --- js/slide22.js | 9 ++++ js/slide23.js | 25 +++++++++ print-interval.html | 58 ++++++++++++++++++++ valid.html | 129 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 221 insertions(+) create mode 100644 print-interval.html create mode 100644 valid.html diff --git a/js/slide22.js b/js/slide22.js index e69de29..6d16576 100644 --- a/js/slide22.js +++ b/js/slide22.js @@ -0,0 +1,9 @@ +var number =0; +do { + number = prompt("Enter a number from 1 to 99"); + if ((number > 0) && (number < 100)) { + console.log(number + " squared is: " + number*number); + } + } while (number < 0 || number > 100); + + \ No newline at end of file diff --git a/js/slide23.js b/js/slide23.js index e69de29..a0de59a 100644 --- a/js/slide23.js +++ b/js/slide23.js @@ -0,0 +1,25 @@ +var num1; +var num2; +//do { + num1 = prompt("Enter the first of two numbers"); + num2 = prompt("Enter the second of the numbers"); + + if (num1 > num2) { + var L = num2; + var U = num1; + for (U = num1; U > L; U--) { + console.log("number: " + U); + document.write("--> " + U); + } + } + if (num2 > num1) { + var L = num1; + var U = num2; + for(L = num1; L < U; L++) { + console.log("number: " + L); + document.write("--> " + L); + } + } + console.log("tadaaaa!"); + document.write("tadaaaa!"); +//} while (2 == 2); diff --git a/print-interval.html b/print-interval.html new file mode 100644 index 0000000..b300fb6 --- /dev/null +++ b/print-interval.html @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + The quickest of brown foxes. + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/valid.html b/valid.html new file mode 100644 index 0000000..f1fbf57 --- /dev/null +++ b/valid.html @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From cdb5ca5076fea715f6e527870a62a26db4f7766f Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 30 Jun 2020 15:20:10 -0400 Subject: [PATCH 2/7] removed valid.html; slide 22 in index.html --- valid.html | 129 ----------------------------------------------------- 1 file changed, 129 deletions(-) delete mode 100644 valid.html diff --git a/valid.html b/valid.html deleted file mode 100644 index f1fbf57..0000000 --- a/valid.html +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - - -
- - -
- - - - - - - - - \ No newline at end of file From 08404fe11311eb3113365eb841b46b8ae2908109 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 30 Jun 2020 15:21:21 -0400 Subject: [PATCH 3/7] removed print-interval.html; slide 23 in index.html --- index.html | 2 +- print-interval.html | 58 --------------------------------------------- 2 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 print-interval.html diff --git a/index.html b/index.html index ef9a207..aca21bb 100644 --- a/index.html +++ b/index.html @@ -12,7 +12,7 @@ - + diff --git a/print-interval.html b/print-interval.html deleted file mode 100644 index b300fb6..0000000 --- a/print-interval.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - The quickest of brown foxes. - - - - - - -
- - -
- - - - - - - - - \ No newline at end of file From ce6e4a150426e748489ea5761bd4689e681de16e Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 30 Jun 2020 15:38:18 -0400 Subject: [PATCH 4/7] cleaned up code and made slide 23 only go from lowest to highest number --- index.html | 6 +++--- js/slide23.js | 12 +++--------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/index.html b/index.html index aca21bb..ea0bcb3 100644 --- a/index.html +++ b/index.html @@ -11,7 +11,7 @@ - + @@ -44,8 +44,8 @@
- - +
diff --git a/js/slide23.js b/js/slide23.js index a0de59a..580ddd1 100644 --- a/js/slide23.js +++ b/js/slide23.js @@ -1,25 +1,19 @@ var num1; var num2; -//do { num1 = prompt("Enter the first of two numbers"); num2 = prompt("Enter the second of the numbers"); if (num1 > num2) { var L = num2; var U = num1; - for (U = num1; U > L; U--) { - console.log("number: " + U); - document.write("--> " + U); + for (L = num2; L < U; L++) { + console.log(L); } } if (num2 > num1) { var L = num1; var U = num2; for(L = num1; L < U; L++) { - console.log("number: " + L); - document.write("--> " + L); + console.log(L); } } - console.log("tadaaaa!"); - document.write("tadaaaa!"); -//} while (2 == 2); From 12a1f58cd5972fc9b147716926074e6d47e58775 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 30 Jun 2020 21:10:46 -0400 Subject: [PATCH 5/7] updated slide 26 --- index.html | 2 +- js/slide24.js | 31 +++++++++++++++++++++++++++++++ js/slide26.js | 9 +++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index ea0bcb3..9c5ebe2 100644 --- a/index.html +++ b/index.html @@ -12,7 +12,7 @@ - + diff --git a/js/slide24.js b/js/slide24.js index e69de29..c9b3ab6 100644 --- a/js/slide24.js +++ b/js/slide24.js @@ -0,0 +1,31 @@ +var myData = new Array(10); +for (var j = 0; j < 10; j++) { + myData[j] = 1; +} +do { + var i; + var v; + console.log(myData.join(" ").toString()); + + var i = console.log("Which index number (starting from 0) do you want to change?"); + ('input').keydown( function( event ) { // + if ( event.which === 13 ) { // + if (i < 0 || i > 10) { + console.log("Your number is outside the range. Goodbye!"); + //break; + } + if (i<=10) { + var v = console.log("What would you like the new value to be?"); + } + } // + } // + ('input').keydown( function( event ) { // + if ( event.which === 13 ) { // + // if (v <= 10) { + myData.splice(i,i,v); + console.log(myData.join(" ").toString()); +// } + // + } // + +} while (i < 0 || i > 10); \ No newline at end of file diff --git a/js/slide26.js b/js/slide26.js index e69de29..afb6b22 100644 --- a/js/slide26.js +++ b/js/slide26.js @@ -0,0 +1,9 @@ +var f1 = 0; +var f2 = 1; + +for (var i = 0; i < 30; i++) { + console.log(f1); + console.log(f2); + f1 = f1 + f2; + f2 = f2 + f1; +} \ No newline at end of file From f00943ebf483d1b084ae5595cea838d7609796b1 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 1 Jul 2020 00:56:11 -0400 Subject: [PATCH 6/7] updated but have not yet solved how to execute expressions without .eval --- js/slide24.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/slide24.js b/js/slide24.js index c9b3ab6..6f8beb0 100644 --- a/js/slide24.js +++ b/js/slide24.js @@ -12,7 +12,7 @@ do { if ( event.which === 13 ) { // if (i < 0 || i > 10) { console.log("Your number is outside the range. Goodbye!"); - //break; + break; } if (i<=10) { var v = console.log("What would you like the new value to be?"); @@ -25,7 +25,7 @@ do { myData.splice(i,i,v); console.log(myData.join(" ").toString()); // } - // + }// } // } while (i < 0 || i > 10); \ No newline at end of file From b7a0f094117f736fcd14f90b562efbbb1c4d412e Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 1 Jul 2020 17:18:15 -0400 Subject: [PATCH 7/7] updated slide 24 --- index.html | 2 +- js/slide24.js | 29 +++++++++-------------------- 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/index.html b/index.html index 9c5ebe2..32c426d 100644 --- a/index.html +++ b/index.html @@ -12,7 +12,7 @@ - + diff --git a/js/slide24.js b/js/slide24.js index 6f8beb0..9ac0b22 100644 --- a/js/slide24.js +++ b/js/slide24.js @@ -3,29 +3,18 @@ for (var j = 0; j < 10; j++) { myData[j] = 1; } do { - var i; - var v; console.log(myData.join(" ").toString()); - - var i = console.log("Which index number (starting from 0) do you want to change?"); - ('input').keydown( function( event ) { // - if ( event.which === 13 ) { // - if (i < 0 || i > 10) { - console.log("Your number is outside the range. Goodbye!"); + + var i = prompt("Which index number (starting from 0) do you want to change?"); + if (i <= 0 || i > 10) { + prompt("Your number is outside the range. Goodbye!"); break; - } - if (i<=10) { - var v = console.log("What would you like the new value to be?"); } - } // - } // - ('input').keydown( function( event ) { // - if ( event.which === 13 ) { // - // if (v <= 10) { + if (i >= 0 && i < 10) { + var v = prompt("What would you like the new value to be?"); + myData.splice(i,i,v); console.log(myData.join(" ").toString()); -// } - }// - } // + } -} while (i < 0 || i > 10); \ No newline at end of file +} while (i < 0 || i > 10);