Merge pull request #7 from danlucas/master

Small fix for a jQuery example + minor fixes to Class #1
gdi-curriculum-review · Jun 19, 2013 · 573b6d3 · 573b6d3
2 parents cbfec24 + 8fc3b42
commit 573b6d3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/class1.html b/class1.html
@@ -120,9 +120,9 @@ <h3>Tools</h3>
              </li>
              <li>
               <div class = "yellow">Text Editor</div>
-              <div>TextWrangler - Mac</div>
-              <div>Notepad ++ - Windows</div>
-              <div>Sublime Text - Mac or Windows</div>
+              <div>TextWrangler - Mac<br /><a href='http://www.barebones.com/products/textwrangler/'>http://www.barebones.com/products/textwrangler/</a></div>
+              <div>Notepad ++ - Windows<br /><a href='http://notepad-plus-plus.org/'>http://notepad-plus-plus.org/</a></div>
+              <div>Sublime Text - Mac or Windows<br /><a href='http://www.sublimetext.com/'>http://www.sublimetext.com/</a></div>
              </li>
           </ul>
         </section>
@@ -131,19 +131,20 @@ <h3>Tools</h3>
         <section>
           <h3>History of JavaScript</h3>
           <ul>
-            <li class = "fragment">Developed by Brendan Eich of Netscape in 1995</li>
-            <li class = "fragment">Standardized in 1997</li>
-            <li class = "fragment">Java -- Actually JavaScript has nothing to do with the language Java. Java was just the cool kid in town at the time</li>
+            <li class = "fragment">Developed by Brendan Eich of Netscape in 1995 (in 10 days!)</li>
+            <li class="fragment">Originally called Mocha and then LiveScript</li>
+            <li class = "fragment">Java -- Actually JavaScript has nothing to do with the language Java. Java was just the cool kid in town at the time.</li>
             <li class = "fragment">Script -- Instructions that a computer can run one line at a time</li>
+            <li class = "fragment">Standardized in 1997</li>
           </ul>
         </section>
 
         <!-- History-->
         <section>
           <h3>History of JavaScript</h3>
           <ul>
-            <li class = "fragment">"AJAX" -- a way to communicate to servers was created in 2005</li>
-            <li class = "fragment">jQuery -- a super-popular JavaScript Library 2006</li>
+            <li class = "fragment">"AJAX" -- a way to communicate to servers, coined in 2005</li>
+            <li class = "fragment">jQuery -- a super-popular JavaScript Library debuted 2006</li>
             <li class = "fragment">Node.js -- a way for JavaScript to perform back end functions in 2010</li>
             <li class = "fragment">2012 -- spec for JavaScript "nearly" finished</li>
           </ul>
@@ -153,7 +154,7 @@ <h3>History of JavaScript</h3>
         <section>
           <h3>What does JavaScript do?</h3>
           <ul>
-            <li><a href = "http://leandrovieira.com/projects/jquery/lightbox/" target = '_blank'>Image Galleries and Lightboxes</a></li>
+            <li><a href = "http://fancyapps.com/fancybox/#examples" target = '_blank'>Image Galleries and Lightboxes</a></li>
             <li><a href = "https://www.google.com/doodles/30th-anniversary-of-pac-man" target = '_blank'>Games and all sorts of Google Doodles</a></li>
             <li><a href = "http://www.girldevelopit.com/materials" target = '_blank'>Interactions, like show/hide and accordians</a></li>
             <li><a href = "http://www.girldevelopit.com/classes" target = '_blank'>Retrieving data from other websites (through APIs)</a></li>
@@ -223,7 +224,8 @@ <h3>Data types</h3>
             <p>number -- (well, a number)</p>
             <pre><code contenteditable class ="javascript">
               var pi = 3.14;
-              var year = 2012;
+              var year = 2013;
+              var bananaTally = 200;
             </code></pre>
           </div>
           <div class = "fragment">
@@ -340,7 +342,7 @@ <h3>Let's Develop It</h3>
 &lt;html>
   &lt;head>
     &lt;title>My Site!&lt;/title>
-    &lt;script src="myjavascriptfile.js">&lt;/script>
+    &lt;script src="javascript.js">&lt;/script>
   &lt;/head>
   &lt;body>
     My site!
@@ -355,14 +357,15 @@ <h3>Let's Develop It</h3>
           <p>Ever wonder how much a lifetime supply of your favorite snack or drink is?</p>
           <ul>
             <li>Store your age in a variable</li>
-            <li>Store your maximum in a variable</li>
+            <li>Store your maximum age in a variable</li>
             <li>Store an estimated amount per day in a variable</li>
             <li>Calculate how many you would eat/drink for the rest of your life.</li>
             <li>Output the result in an alert(see below) like so: "You will need NN to last you until your old age of NN"</li>
           </ul>
 
-          <pre><code contenteditable class ="javascript">
-          alert(answer);
+<pre><code contenteditable class ="javascript">
+  alert(answer);
+
 </code></pre>
 
         </section>

diff --git a/class3.html b/class3.html
@@ -201,7 +201,7 @@ <h3>Updating attributes and css</h3>
           <h3>Updating values and html</h3>
           <div class = "fragment">
             <pre><code contenteditable class = "html">
-  &lt;div class = "results">Boo!&lt;/div>         
+  &lt;div id = "results">Boo!&lt;/div>         
             </code></pre>
           </div>
           <div class = "fragment">
@@ -219,7 +219,7 @@ <h3>Updating values and html</h3>
           <h3>Append and Prepend</h3>
           <div class = "fragment">
             <pre><code contenteditable class = "html">
-  &lt;div class = "results">Boo!&lt;/div>         
+  &lt;div id = "results">Boo!&lt;/div>         
             </code></pre>
           </div>
           <div class = "fragment">