diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..11f7f17 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Head-First-JavaScript-Programming \ No newline at end of file diff --git a/.idea/Head-First-JavaScript-Programming.iml b/.idea/Head-First-JavaScript-Programming.iml new file mode 100644 index 0000000..c956989 --- /dev/null +++ b/.idea/Head-First-JavaScript-Programming.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..19f74da --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..fe3cbb5 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..b471e6a --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,364 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + 1428456737252 + + + 1428457829671 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/chapter1/behavior.html b/chapter1/behavior.html index c8cde74..a122957 100644 --- a/chapter1/behavior.html +++ b/chapter1/behavior.html @@ -1,19 +1,20 @@ - -Just a Generic Page - + + Just a Generic Page +

Just a generic heading

+

Not a lot to read about here. I'm just an obligatory paragraph living in -an example in a JavaScript book. I'm looking for something to make my life more -exciting.

+ an example in a JavaScript book. I'm looking for something to make my life more + exciting.

diff --git a/chapter1/code.js b/chapter1/code.js index baf9fd4..3d08e96 100644 --- a/chapter1/code.js +++ b/chapter1/code.js @@ -1,11 +1,11 @@ scoops = 5; while (scoops > 0) { document.write("Another scoop!
"); - if (scoops < 3) { + /*if (scoops < 3) { alert("Ice cream is running low!"); } else if (scoops >= 5) { alert("Eat faster, the ice cream is going to melt!"); - } + }*/ scoops = scoops - 1; } document.write("Life without ice cream isn't the same"); diff --git a/chapter1/generic.html b/chapter1/generic.html index e803401..b6f6b1d 100644 --- a/chapter1/generic.html +++ b/chapter1/generic.html @@ -1,6 +1,16 @@ +<<<<<<< HEAD + + Just a Generic Page + +======= Just a Generic Page +>>>>>>> parent of 0536fb1... nothing

Just a generic heading

diff --git a/chapter1/howdy.html b/chapter1/howdy.html index 4f96db2..35c1107 100644 --- a/chapter1/howdy.html +++ b/chapter1/howdy.html @@ -1,14 +1,14 @@ - + Howdy - - - - + + + + diff --git a/chapter1/icecream.html b/chapter1/icecream.html index ff8dee2..11e3cce 100644 --- a/chapter1/icecream.html +++ b/chapter1/icecream.html @@ -1,12 +1,18 @@ - + Icecream! +<<<<<<< HEAD + + + + +======= - +>>>>>>> origin/master